commit c3840c0ab753b6d15a5b5d02507244d21cb984a0
author Jihoon Kang <jihoonkang@google.com> Tue Jan 24 23:33:46 2023 +0000
committer Jihoon Kang <jihoonkang@google.com> Mon May 08 23:14:06 2023 +0000
tree 3074b923553bb96f8ea9cd5cd1d4c17752a8f332
parent fffc1eaadbec008de5c84f05eee67e42ba3121bd

Add module lib API surface java_api_library module for single tree build

Add `java_api_library` module definition for module lib API surface full
from-text stub `android.jar` generation. java_api_contribution modules
are dynamically created from bp file defined or java_sdk_library created
droidstubs modules.

Test: m android_module_lib_stubs_current.from-text
Change-Id: I95794823c60ea617c13349fee9faab53b7208f10

apis/Android.bp

diff --git a/apis/Android.bp b/apis/Android.bp
index 03ee13a..32eeb66 100644
--- a/apis/Android.bp
+++ b/apis/Android.bp
@@ -44,6 +44,22 @@
     ],
 }
 
+java_defaults {
+    name: "android_module_lib_stubs_current_contributions",
+    api_surface: "module-lib",
+    api_contributions: [
+        "api-stubs-docs-non-updatable.api.contribution",
+        "system-api-stubs-docs-non-updatable.api.contribution",
+        "module-lib-api-stubs-docs-non-updatable.api.contribution",
+        "art.module.public.api.stubs.source.api.contribution",
+        "art.module.public.api.stubs.source.system.api.contribution",
+        "art.module.public.api.stubs.source.module_lib.api.contribution",
+        "i18n.module.public.api.stubs.source.api.contribution",
+        "i18n.module.public.api.stubs.source.system.api.contribution",
+        "i18n.module.public.api.stubs.source.module_lib.api.contribution",
+    ],
+}
+
 // Java API library definitions per API surface
 java_api_library {
     name: "android_stubs_current.from-text",
@@ -89,3 +105,33 @@
         "system-api-stubs-docs-non-updatable.api.contribution",
     ],
 }
+
+java_api_library {
+    name: "android_module_lib_stubs_current_full.from-text",
+    api_surface: "module-lib",
+    defaults: [
+        "android_stubs_current_contributions",
+        "android_system_stubs_current_contributions",
+        "android_module_lib_stubs_current_contributions_full",
+    ],
+    libs: [
+        "stub-annotations",
+    ],
+    api_contributions: [
+        "api-stubs-docs-non-updatable.api.contribution",
+        "system-api-stubs-docs-non-updatable.api.contribution",
+        "module-lib-api-stubs-docs-non-updatable.api.contribution",
+    ],
+}
+
+java_api_library {
+    name: "android_module_lib_stubs_current.from-text",
+    api_surface: "module-lib",
+    defaults: [
+        "android_module_lib_stubs_current_contributions",
+    ],
+    libs: [
+        "android_module_lib_stubs_current_full.from-text",
+        "stub-annotations",
+    ],
+}
\ No newline at end of file