From 519a8924f9438e67d9d6da78e68ee357327e3ec0 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 3 Mar 2023 15:25:41 +0000
Subject: 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
---
 Android.bp          |  9 ---------
 StubLibraries.bp    |  9 ---------
 core/api/Android.bp | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Android.bp b/Android.bp
index 0c9b82e5990e..67902b310481 100644
--- a/Android.bp
+++ b/Android.bp
@@ -619,12 +619,3 @@ build = [
     "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 38413c22a3d5..71531c4c0ccb 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -610,12 +610,3 @@ java_library {
     ],
     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 114a957674ae..02562447dc6b 100644
--- a/core/api/Android.bp
+++ b/core/api/Android.bp
@@ -65,3 +65,21 @@ filegroup {
         "//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",
+    ],
+}
-- 
cgit v1.2.3-59-g8ed1b