diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-02 17:49:26 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-05-04 13:54:10 +0100 |
| commit | f68ddeaa8a1468f49fd3bdd5092bfaba8615952c (patch) | |
| tree | c8da1563d324785009890eff925f65f8ba6f8a81 | |
| parent | da8f7afd30ca8bd0572ac0f1610734346cdb9567 (diff) | |
Change last-released filegroup
There were two different filegroups referencing the same last released
APIs. Delete the manually defined one and switch references over to use
the one defined by prebuilt_apis.
Bug: 155197156
Test: m
Change-Id: Ib15d2c08e6400546ca03de6bfd4e5cbcc938c992
Merged-In: Ib15d2c08e6400546ca03de6bfd4e5cbcc938c992
| -rw-r--r-- | ApiDocs.bp | 2 | ||||
| -rw-r--r-- | StubLibraries.bp | 16 | ||||
| -rw-r--r-- | services/Android.bp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 33d3d47ca946..60f56de73598 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -79,7 +79,7 @@ stubs_defaults { "sdk-dir", "api-versions-jars-dir", ], - previous_api: ":last-released-public-api", + previous_api: ":android.api.public.latest", merge_annotations_dirs: [ "metalava-manual", ], diff --git a/StubLibraries.bp b/StubLibraries.bp index 74b0524f4fd2..097fb7427870 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -54,7 +54,7 @@ stubs_defaults { libs: ["framework-internal-utils"], installable: false, annotations_enabled: true, - previous_api: ":last-released-public-api", + previous_api: ":android.api.public.latest", merge_annotations_dirs: [ "metalava-manual", ], @@ -97,13 +97,13 @@ droidstubs { removed_api_file: "api/removed.txt", }, last_released: { - api_file: ":last-released-public-api", + api_file: ":android.api.public.latest", removed_api_file: "api/removed.txt", baseline_file: ":public-api-incompatibilities-with-last-released", }, api_lint: { enabled: true, - new_since: ":last-released-public-api", + new_since: ":android.api.public.latest", baseline_file: "api/lint-baseline.txt", }, }, @@ -139,13 +139,13 @@ droidstubs { removed_api_file: "api/system-removed.txt", }, last_released: { - api_file: ":last-released-system-api", + api_file: ":android.api.system.latest", removed_api_file: "api/system-removed.txt", baseline_file: ":system-api-incompatibilities-with-last-released" }, api_lint: { enabled: true, - new_since: ":last-released-system-api", + new_since: ":android.api.system.latest", baseline_file: "api/system-lint-baseline.txt", }, }, @@ -207,13 +207,13 @@ droidstubs { removed_api_file: "api/module-lib-removed.txt", }, last_released: { - api_file: ":last-released-module-lib-api", + api_file: ":android.api.module-lib.latest", removed_api_file: "api/module-lib-removed.txt", baseline_file: ":module-lib-api-incompatibilities-with-last-released" }, api_lint: { enabled: true, - new_since: ":last-released-module-lib-api", + new_since: ":android.api.module-lib.latest", baseline_file: "api/module-lib-lint-baseline.txt", }, }, @@ -314,7 +314,7 @@ droidstubs { installable: false, sdk_version: "core_platform", annotations_enabled: true, - previous_api: ":last-released-public-api", + previous_api: ":android.api.public.latest", merge_annotations_dirs: [ "metalava-manual", ], diff --git a/services/Android.bp b/services/Android.bp index b4d8393683ba..0d221b930f5d 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -122,13 +122,13 @@ droidstubs { removed_api_file: "api/removed.txt", }, last_released: { - api_file: ":last-released-system-server-api", + api_file: ":android.api.system-server.latest", removed_api_file: "api/removed.txt", baseline_file: ":system-server-api-incompatibilities-with-last-released" }, api_lint: { enabled: true, - new_since: ":last-released-system-server-api", + new_since: ":android.api.system-server.latest", baseline_file: "api/lint-baseline.txt", }, }, |