1 files changed, 15 insertions, 13 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 8fd8c907202c..50524998d416 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -48,7 +48,6 @@ stubs_defaults {
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
         ":art-module-public-api-stubs-source",
-        ":conscrypt.module.public.api.stubs.source",
         ":android_icu4j_public_api_files",
     ],
     // TODO(b/147699819): remove below aidl includes.
@@ -58,7 +57,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",
     ],
@@ -69,7 +68,10 @@ stubs_defaults {
 stubs_defaults {
     name: "metalava-full-api-stubs-default",
     defaults: ["metalava-base-api-stubs-default"],
-    srcs: [":framework-updatable-sources"],
+    srcs: [
+        ":conscrypt.module.public.api.stubs.source",
+        ":framework-updatable-sources",
+    ],
     sdk_version: "core_platform",
 }
 
@@ -109,13 +111,13 @@ droidstubs {
             removed_api_file: "api/removed.txt",
         },
         last_released: {
-            api_file: ":last-released-public-api",
-            removed_api_file: "api/removed.txt",
+            api_file: ":android.api.public.latest",
+            removed_api_file: ":removed.api.public.latest",
             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 +153,13 @@ droidstubs {
             removed_api_file: "api/system-removed.txt",
         },
         last_released: {
-            api_file: ":last-released-system-api",
-            removed_api_file: "api/system-removed.txt",
+            api_file: ":android.api.system.latest",
+            removed_api_file: ":removed.api.system.latest",
             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 +217,13 @@ droidstubs {
             removed_api_file: "api/module-lib-removed.txt",
         },
         last_released: {
-            api_file: ":last-released-module-lib-api",
-            removed_api_file: "api/module-lib-removed.txt",
+            api_file: ":android.api.module-lib.latest",
+            removed_api_file: ":removed.api.module-lib.latest",
             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 +320,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",
     ],