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

This commit is contained in:
Jihoon Kang
2023-08-17 01:36:33 +00:00
committed by Gerrit Code Review

View File

@@ -55,19 +55,6 @@ java_library {
],
}
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 @@ java_defaults {
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_library {
],
}
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_library {
],
}
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,