diff options
| author | Anton Hansson <hansson@google.com> | 2020-11-05 17:23:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-05 17:23:24 +0000 |
| commit | 78d5048610796f79b4ea7d89253227f562dbb39e (patch) | |
| tree | b0ded6a41c0fc0f4f2035f96647cf72b65fa0e44 | |
| parent | aa756e198cfb4f0b288aed03c6c1f743a43757eb (diff) | |
| parent | 552ba2c492ba90084ba93366875ebb0d12be63c5 (diff) | |
Merge "Move testapi API files for symmetry with others"
| -rw-r--r-- | StubLibraries.bp | 10 | ||||
| -rw-r--r-- | core/api/test-current.txt (renamed from api/test-current.txt) | 0 | ||||
| -rw-r--r-- | core/api/test-lint-baseline.txt (renamed from api/test-lint-baseline.txt) | 0 | ||||
| -rw-r--r-- | core/api/test-removed.txt (renamed from api/test-removed.txt) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index cff96b71f8c2..7060347922b9 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -225,7 +225,7 @@ droidstubs { } droidstubs { - name: "test-api-stubs-docs", + name: "test-api-stubs-docs-non-updatable", defaults: ["metalava-non-updatable-api-stubs-default"], arg_files: [ "core/res/AndroidManifest.xml", @@ -237,12 +237,12 @@ droidstubs { + "\\)", check_api: { current: { - api_file: "api/test-current.txt", - removed_api_file: "api/test-removed.txt", + api_file: "core/api/test-current.txt", + removed_api_file: "core/api/test-removed.txt", }, api_lint: { enabled: true, - baseline_file: "api/test-lint-baseline.txt", + baseline_file: "core/api/test-lint-baseline.txt", }, }, dist: { @@ -361,7 +361,7 @@ java_library_static { java_library_static { name: "android_test_stubs_current", - srcs: [ ":test-api-stubs-docs" ], + srcs: [ ":test-api-stubs-docs-non-updatable" ], static_libs: [ // Modules do not have test APIs, but we want to include their SystemApis, like we include // the SystemApi of framework-non-updatable-sources. diff --git a/api/test-current.txt b/core/api/test-current.txt index 9c517296d35c..9c517296d35c 100644 --- a/api/test-current.txt +++ b/core/api/test-current.txt diff --git a/api/test-lint-baseline.txt b/core/api/test-lint-baseline.txt index f5ab40abdf37..f5ab40abdf37 100644 --- a/api/test-lint-baseline.txt +++ b/core/api/test-lint-baseline.txt diff --git a/api/test-removed.txt b/core/api/test-removed.txt index d802177e249b..d802177e249b 100644 --- a/api/test-removed.txt +++ b/core/api/test-removed.txt |