Remove libraries containing conscrypt and i18n stubs from sdk
The core.current.stubs, core.module_lib.stubs,
legacy.core.platform.api.stubs and stable.core.platform.api.stubs
libraries include stubs from conscrypt and i18n. The stubs should not
be part of the ART sdk snapshot and instead should be provided by their
own sdk snapshots.
The libraries and their associated java_system_modules will be defined
in build/soong/java/core-libraries/Android.bp so that they will always
be present and do not need prebuilts.
This change removes those libraries and their associated
java_system_modules from the sdk snapshot. So, they are no either
directly exported or included as a private member for use by their
associated java_system_modules.
It also exports the core-lambda-stubs-for-system-modules and
core-generated-annotation-stubs libraries, which were previously
included in the sdk as private members, for use by the
java_system_modules definitions in build/soong.
Bug: 193311122
Test: m droid
Change-Id: I18ffe3f1470a1226a1ff43aea0446a2558cdceda
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 4294a98..fd6dca4 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -99,22 +99,13 @@
// internally.
"core-lambda-stubs",
- // Needed by any module that builds against any non-numeric
- // sdk_version other than "none" or "core_platform".
- //
- // This is actually only used for compiling Java 8 and kotlin.
- // Java 9 uses system modules which encapsulates this
- // internally.
- "core.current.stubs",
+ // A special form or "core-lambda-stubs" for use in
+ // java_system_modules.
+ "core-lambda-stubs-for-system-modules",
- // Needed by any module that builds against an sdk_version of
- // "core_platform".
- //
- // This is actually only used for compiling Java 8 and kotlin.
- // Java 9 uses system modules which encapsulates this
- // internally.
- "legacy.core.platform.api.stubs",
- "stable.core.platform.api.stubs",
+ // Needed when javac compiles code containing @Generated
+ // annotations produced by some code generation tools.
+ "core-generated-annotation-stubs",
],
java_sdk_libs: [
@@ -125,10 +116,6 @@
"art-module-public-api-stubs-system-modules",
"art-module-lib-api-stubs-system-modules",
"art-module-intra-core-api-stubs-system-modules",
- "core-current-stubs-system-modules",
- "core-module-lib-stubs-system-modules",
- "legacy-core-platform-api-stubs-system-modules",
- "stable-core-platform-api-stubs-system-modules",
],
native_header_libs: [
"libnativeloader-headers",