commit 4434b7132c364558b9005b79a58d49b0591ff116
author Jihoon Kang <jihoonkang@google.com> Thu Aug 17 01:26:23 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 17 01:26:23 2023 +0000
tree eeca003aad6a93b4b16b2a28f1bf06f524839ac2
parent b6ec2c8ea0ce6b103a5d2a93c53fdf8325fc36c6

Revert "Move from-text stub java_api_library modules closer to s..."

Revert submission 2655262-move_java_api_libraries

Reason for revert: Breaking build

Reverted changes: /q/submissionid:2655262-move_java_api_libraries

Change-Id: I2719de4d35e5a4131468d7e84b369631ec86eb2b

java/core-libraries/Android.bp

diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp
index 4380f4f..de9a82d 100644
--- a/java/core-libraries/Android.bp
+++ b/java/core-libraries/Android.bp
@@ -55,19 +55,6 @@
     ],
 }
 
-java_api_library {
-    name: "core.current.stubs.from-text",
-    api_surface: "core",
-    api_contributions: [
-        "art.module.public.api.stubs.source.api.contribution",
-        "conscrypt.module.public.api.stubs.source.api.contribution",
-        "i18n.module.public.api.stubs.source.api.contribution",
-    ],
-    libs: [
-        "stub-annotations",
-    ],
-}
-
 java_library {
     name: "core.current.stubs",
     defaults: [
@@ -166,6 +153,7 @@
     system_modules: "none",
 }
 
+
 // A stubs target containing the parts of the public SDK & @SystemApi(MODULE_LIBRARIES) API
 // provided by the core libraries.
 //
@@ -277,32 +265,6 @@
     ],
 }
 
-java_defaults {
-    name: "android_core_platform_stubs_current_contributions",
-    api_surface: "core_platform",
-    api_contributions: [
-        "art.module.public.api.stubs.source.api.contribution",
-        "art.module.public.api.stubs.source.system.api.contribution",
-        "art.module.public.api.stubs.source.module_lib.api.contribution",
-        "conscrypt.module.platform.api.stubs.source.api.contribution",
-        "i18n.module.public.api.stubs.source.api.contribution",
-    ],
-}
-
-java_api_library {
-    name: "legacy.core.platform.api.stubs.from-text",
-    api_surface: "core_platform",
-    defaults: [
-        "android_core_platform_stubs_current_contributions",
-    ],
-    api_contributions: [
-        "legacy.i18n.module.platform.api.stubs.source.api.contribution",
-    ],
-    libs: [
-        "stub-annotations",
-    ],
-}
-
 java_library {
     name: "legacy.core.platform.api.stubs",
     visibility: core_platform_visibility,
@@ -366,20 +328,6 @@
     ],
 }
 
-java_api_library {
-    name: "stable.core.platform.api.stubs.from-text",
-    api_surface: "core_platform",
-    defaults: [
-        "android_core_platform_stubs_current_contributions",
-    ],
-    api_contributions: [
-        "stable.i18n.module.platform.api.stubs.source.api.contribution",
-    ],
-    libs: [
-        "stub-annotations",
-    ],
-}
-
 java_library {
     name: "stable.core.platform.api.stubs",
     visibility: core_platform_visibility,