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

RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp

Browse Source 
This change was already submitted with
https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22
but was never propagated to downstream.

Ignore-AOSP-First: change already merged in aosp

Test: m nothing --build-from-text-stub
Change-Id: I1f2f33e1a5df6f7b8f8215ab41b41228fa873ea1
This commit is contained in:
Jihoon Kang
2023-09-22 00:28:20 +00:00
parent 75e0bbda5d
commit 818f3d9485
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,