StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move from-text stub java_api_library modules closer to source

Browse Source 
This change moves java_api_library modules that were previously defined
in build/orchestrator closer to where their from-source equivalents are
defined.

Test: m (default to from-text stub build)
Bug: 274805756
Merged-In: If66b5bba719bb389a69f2353d2218a89b2b96b90
Change-Id: If66b5bba719bb389a69f2353d2218a89b2b96b90
This commit is contained in:
Jihoon Kang
2023-07-25 05:46:13 +00:00
parent f768e6e27e
commit b6ec2c8ea0
1 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
java/core-libraries/Android.bp
View File

@@ -55,6 +55,19 @@ 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 { java_library {
name: "core.current.stubs", name: "core.current.stubs",
defaults: [ defaults: [
@@ -153,7 +166,6 @@ java_defaults {
system_modules: "none", system_modules: "none",
} }
// A stubs target containing the parts of the public SDK & @SystemApi(MODULE_LIBRARIES) API // A stubs target containing the parts of the public SDK & @SystemApi(MODULE_LIBRARIES) API
// provided by the core libraries. // provided by the core libraries.
// //
@@ -265,6 +277,32 @@ 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 { java_library {
name: "legacy.core.platform.api.stubs", name: "legacy.core.platform.api.stubs",
visibility: core_platform_visibility, visibility: core_platform_visibility,
@@ -328,6 +366,20 @@ 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 { java_library {
name: "stable.core.platform.api.stubs", name: "stable.core.platform.api.stubs",
visibility: core_platform_visibility, visibility: core_platform_visibility,