Move java_api_contributions closer to their source
These don't need to be defined in the top level Android.bp. Move
them into the directory where the files live.
Bug: 271563074
Test: m
Change-Id: I104374e49ba62de50016aa4a22173d5dbd00c257
diff --git a/Android.bp b/Android.bp
index 0c9b82e..67902b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -619,12 +619,3 @@
"ProtoLibraries.bp",
"TestProtoLibraries.bp",
]
-
-java_api_contribution {
- name: "api-stubs-docs-non-updatable-public-stubs",
- api_surface: "public",
- api_file: "core/api/current.txt",
- visibility: [
- "//build/orchestrator/apis",
- ],
-}
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 38413c2..71531c4 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -610,12 +610,3 @@
],
visibility: ["//visibility:public"],
}
-
-java_api_contribution {
- name: "frameworks-base-core-api-module-lib-stubs",
- api_surface: "module-lib",
- api_file: "core/api/module-lib-current.txt",
- visibility: [
- "//build/orchestrator/apis",
- ],
-}
diff --git a/core/api/Android.bp b/core/api/Android.bp
index 114a957..0256244 100644
--- a/core/api/Android.bp
+++ b/core/api/Android.bp
@@ -65,3 +65,21 @@
"//cts/tests/signature/api",
],
}
+
+java_api_contribution {
+ name: "api-stubs-docs-non-updatable-public-stubs",
+ api_surface: "public",
+ api_file: "current.txt",
+ visibility: [
+ "//build/orchestrator/apis",
+ ],
+}
+
+java_api_contribution {
+ name: "frameworks-base-core-api-module-lib-stubs",
+ api_surface: "module-lib",
+ api_file: "module-lib-current.txt",
+ visibility: [
+ "//build/orchestrator/apis",
+ ],
+}