commit 25b6cedb251c3690da2e2d46bd378264aae36cf2
author Jihoon Kang <jihoonkang@google.com> Wed Sep 20 21:48:09 2023 +0000
committer Jihoon Kang <jihoonkang@google.com> Wed Sep 20 22:05:20 2023 +0000
tree 4e482f415135b61a47fa6892473eff93620f941b
parent 1c5022b9c33716c06b9f14d1a08126a7f31ee79f

Replace api_files prop to api_contributions

As a process to enforce all api files in java_api_library to be passed
via java_api_contributions, this change removes the remaining usages of
api_files property in java_api_library and replace them with
java_api_contributions

Test: m --build-from-text-stub
Bug: 300964421
Change-Id: Iabeebef2cd0ab7c49d60c7e79d484df3237fced4

api/StubLibraries.bp

diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp
index b17fbff..ba11ded 100644
--- a/api/StubLibraries.bp
+++ b/api/StubLibraries.bp
@@ -376,8 +376,8 @@
 java_api_library {
     name: "android-non-updatable.stubs.from-text",
     api_surface: "public",
-    api_files: [
-        ":non-updatable-current.txt",
+    api_contributions: [
+        "api-stubs-docs-non-updatable.api.contribution",
     ],
     defaults: ["android-non-updatable_from_text_defaults"],
     full_api_surface_stub: "android_stubs_current.from-text",
@@ -386,9 +386,9 @@
 java_api_library {
     name: "android-non-updatable.stubs.system.from-text",
     api_surface: "system",
-    api_files: [
-        ":non-updatable-current.txt",
-        ":non-updatable-system-current.txt",
+    api_contributions: [
+        "api-stubs-docs-non-updatable.api.contribution",
+        "system-api-stubs-docs-non-updatable.api.contribution",
     ],
     defaults: ["android-non-updatable_from_text_defaults"],
     full_api_surface_stub: "android_system_stubs_current.from-text",
@@ -397,10 +397,10 @@
 java_api_library {
     name: "android-non-updatable.stubs.test.from-text",
     api_surface: "test",
-    api_files: [
-        ":non-updatable-current.txt",
-        ":non-updatable-system-current.txt",
-        ":non-updatable-test-current.txt",
+    api_contributions: [
+        "api-stubs-docs-non-updatable.api.contribution",
+        "system-api-stubs-docs-non-updatable.api.contribution",
+        "test-api-stubs-docs-non-updatable.api.contribution",
     ],
     defaults: ["android-non-updatable_from_text_defaults"],
     full_api_surface_stub: "android_test_stubs_current.from-text",
@@ -409,10 +409,10 @@
 java_api_library {
     name: "android-non-updatable.stubs.module_lib.from-text",
     api_surface: "module_lib",
-    api_files: [
-        ":non-updatable-current.txt",
-        ":non-updatable-system-current.txt",
-        ":non-updatable-module-lib-current.txt",
+    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",
     ],
     defaults: ["android-non-updatable_from_text_defaults"],
     full_api_surface_stub: "android_module_lib_stubs_current_full.from-text",