commit 2a829bb51e36c70ee5914da08b568f4055169536
author Jihoon Kang <jihoonkang@google.com> Thu Feb 01 22:01:15 2024 +0000
committer Jihoon Kang <jihoonkang@google.com> Fri Feb 02 07:28:23 2024 +0000
tree 4def3022f0e21ad9cb2a52ecc6efe60beccedf0e
parent ed2395aa096a06af174f8224842ae44fb2601305

Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions

This change modifies the sdk-annotations-*.zip definitions so that the
modules depend on the exportable annotations.zip files instead of the
everything annotations.zip files.

This change also modifies the definition of the
android_*_stubs_current_with_test_libs modules definitions to depend on
the exportable stubs.

Likewise, the droiddoc modules now depend on the exportable stubs.

Test: m docs dist && inspect ninja file to verify that everything stubs are not exported
Test: m sdk dist && inspect api-versions.xml file and verify that the disabled apis are not included
Bug: 323261972
Change-Id: I015921f0d006bac29492be22b83043b39a8fe8eb

api/StubLibraries.bp

diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp
index ec4fc46..5de27b0 100644
--- a/api/StubLibraries.bp
+++ b/api/StubLibraries.bp
@@ -962,7 +962,7 @@
 java_library {
     name: "android_stubs_current_with_test_libs",
     static_libs: [
-        "android_stubs_current",
+        "android_stubs_current_exportable",
         "android.test.base.stubs",
         "android.test.mock.stubs",
         "android.test.runner.stubs",
@@ -977,7 +977,7 @@
 java_library {
     name: "android_system_stubs_current_with_test_libs",
     static_libs: [
-        "android_system_stubs_current",
+        "android_system_stubs_current_exportable",
         "android.test.base.stubs.system",
         "android.test.mock.stubs.system",
         "android.test.runner.stubs.system",
@@ -992,7 +992,7 @@
 java_library {
     name: "android_module_stubs_current_with_test_libs",
     static_libs: [
-        "android_module_lib_stubs_current",
+        "android_module_lib_stubs_current_exportable",
         "android.test.base.stubs",
         "android.test.mock.stubs",
         "android.test.runner.stubs",
@@ -1007,7 +1007,7 @@
 java_library {
     name: "android_system_server_stubs_current_with_test_libs",
     static_libs: [
-        "android_system_server_stubs_current",
+        "android_system_server_stubs_current_exportable",
         "android.test.base.stubs.system",
         "android.test.mock.stubs.system",
         "android.test.runner.stubs.system",