Move ICU's IntraCoreApi stubs to java_sdk_library.

Test: m
Bug: 157734636
Change-Id: I8d032e6d6518cdd00eef4d4fb8a73aae567e7c93

3 files changed, 32 insertions, 40 deletions

diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index c5edf4104..90ca7ed36 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -139,6 +139,22 @@ java_library {
     system_modules: "art-module-public-api-stubs-system-modules",
 }
 
+// Referenced implicitly from i18n.module.intra.api.
+filegroup {
+    name: "i18n.module.intra.api.api.public.latest",
+    srcs: [
+        "api/intra/last-api.txt",
+    ],
+}
+
+// Referenced implicitly from i18n.module.intra.api.
+filegroup {
+    name: "i18n.module.intra.api-removed.api.public.latest",
+    srcs: [
+        "api/intra/last-removed.txt",
+    ],
+}
+
 // Generates stub source files for the intra-core API of the I18N module.
 // i.e. every class/member that is either in the public API or annotated with
 // @IntraCoreApi.
@@ -146,55 +162,31 @@ java_library {
 // The API specification .txt files managed by this only contain the additional
 // classes/members that are in the intra-core API but which are not the public
 // API.
-droidstubs {
-    name: "i18n-module-intra-core-api-stubs-source",
-    visibility: [
-        // Needed to build core-all as using the compiled library, i.e.
-        // i18n.module.intra.core.api.stubs does not work due to limitations
-        // in javac.
-        "//libcore:__subpackages__",
-    ],
+java_sdk_library {
+    name: "i18n.module.intra.core.api",
     srcs: [
         ":android_icu4j_repackaged_src_files",
         ":libcore_icu_bridge_src_files",
     ],
-    sdk_version: "none",
-    system_modules: "art-module-intra-core-api-stubs-system-modules",
-
-    installable: false,
-    args: "--hide-annotation libcore.api.Hide " +
-        "--show-single-annotation libcore.api.IntraCoreApi " +
-        "--skip-annotation-instance-methods=false ",
-
-    api_filename: "api.txt",
-    removed_api_filename: "removed.txt",
-    previous_api: "previous.txt",
-    check_api: {
-        current: {
-            api_file: "api/intra/current-api.txt",
-            removed_api_file: "api/intra/current-removed.txt",
-        },
-        last_released: {
-            api_file: "api/intra/last-api.txt",
-            removed_api_file: "api/intra/last-removed.txt",
-        },
-    },
-}
-
-// A library containing the intra-core API stubs of the I18N module.
-//
-// Intra-core APIs are only intended for the use of other core library modules.
-java_library {
-    name: "i18n.module.intra.core.api.stubs",
     visibility: [
         "//libcore:__subpackages__",
+        "//packages/modules/RuntimeI18n/apex",
+        // Visibility for prebuilt i18n-module-sdk from the prebuilt of
+        // this module.
+        // TODO(b/155921753): Restrict this when prebuilts are in their proper
+        // locations.
+        "//prebuilts:__subpackages__",
     ],
-    srcs: [
-        ":i18n-module-intra-core-api-stubs-source",
-    ],
-
+    api_dir: "api/intra",
+    api_only: true,
     sdk_version: "none",
     system_modules: "art-module-intra-core-api-stubs-system-modules",
+
+    droiddoc_options: [
+        "--hide-annotation libcore.api.Hide ",
+        "--show-single-annotation libcore.api.IntraCoreApi ",
+        "--skip-annotation-instance-methods=false ",
+    ],
 }
 
 // Referenced implicitly from i18n.module.platform.api.
diff --git a/android_icu4j/api/intra/current-api.txt b/android_icu4j/api/intra/current.txt
index 850884b2a..850884b2a 100644
--- a/android_icu4j/api/intra/current-api.txt
+++ b/android_icu4j/api/intra/current.txt
diff --git a/android_icu4j/api/intra/current-removed.txt b/android_icu4j/api/intra/removed.txt
index d802177e2..d802177e2 100644
--- a/android_icu4j/api/intra/current-removed.txt
+++ b/android_icu4j/api/intra/removed.txt