Merge "Compose the main stubs jars from module stubs"

1 files changed, 38 insertions, 2 deletions

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 146b848ef2d1..5754e57bac3c 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -310,13 +310,31 @@ java_defaults {
 }
 
 java_library_static {
-    name: "android_stubs_current",
+    name: "android_monolith_stubs_current",
     srcs: [ ":api-stubs-docs" ],
     defaults: ["android_defaults_stubs_current"],
 }
 
 java_library_static {
-    name: "android_system_stubs_current",
+    name: "android_merged_stubs_current",
+    srcs: [ ":api-stubs-docs-non-updatable" ],
+    static_libs: [
+        "conscrypt.module.public.api.stubs",
+        "framework-sdkextensions.stubs",
+        "framework-tethering.stubs",
+        "updatable_media_stubs.public",
+    ],
+    defaults: ["android_defaults_stubs_current"],
+}
+
+java_library_static {
+    name: "android_stubs_current",
+    static_libs: ["android_merged_stubs_current"],
+    defaults: ["android_defaults_stubs_current"],
+}
+
+java_library_static {
+    name: "android_system_monolith_stubs_current",
     srcs: [ ":system-api-stubs-docs" ],
     defaults: [
         "android_defaults_stubs_current",
@@ -336,6 +354,24 @@ java_library_static {
 }
 
 java_library_static {
+    name: "android_system_merged_stubs_current",
+    srcs: [ ":system-api-stubs-docs-non-updatable" ],
+    static_libs: [
+        "conscrypt.module.public.api.stubs",
+        "framework-sdkextensions.stubs.system",
+        "framework-tethering.stubs.system",
+        "updatable_media_stubs",
+    ],
+    defaults: ["android_defaults_stubs_current"],
+}
+
+java_library_static {
+    name: "android_system_stubs_current",
+    static_libs: ["android_system_merged_stubs_current"],
+    defaults: ["android_defaults_stubs_current"],
+}
+
+java_library_static {
     name: "android_test_stubs_current",
     srcs: [ ":test-api-stubs-docs" ],
     defaults: [