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
diff --git a/ApiDocs.bp b/ApiDocs.bp
index fbc5c9d..c41a200 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -79,7 +79,7 @@
"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 8fd8c90..170cac4 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -58,7 +58,7 @@
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",
],
@@ -109,13 +109,13 @@
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",
},
},
@@ -151,13 +151,13 @@
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",
},
},
@@ -215,13 +215,13 @@
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",
},
},
@@ -318,7 +318,7 @@
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 6d637be..3a6a538 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -128,13 +128,13 @@
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",
},
},