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

Merge "Enable from-source vs from-text toggling for core.module_lib.stubs." into main am: 6553cf54fb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680437

Change-Id: I00ed2b680963c5835956fdc108443a4abe30fc31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Romain Jobredeaux
2023-07-31 13:31:57 +00:00
committed by Automerger Merge Worker
parent 7c3c80d082 6553cf54fb
commit 32b8846921
2 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,12 +146,43 @@ java_system_modules {
], ],
} }
java_defaults {
name: "core.module_lib.stubs.defaults",
visibility: ["//visibility:private"],
sdk_version: "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.
// //
// Don't use this directly, use "sdk_version: module_current". // Don't use this directly, use "sdk_version: module_current".
java_library { java_library {
name: "core.module_lib.stubs", name: "core.module_lib.stubs",
defaults: [
"core.module_lib.stubs.defaults",
],
static_libs: [
"core.module_lib.stubs.from-source",
],
product_variables: {
build_from_text_stub: {
static_libs: [
"core.module_lib.stubs.from-text",
],
exclude_static_libs: [
"core.module_lib.stubs.from-source",
],
},
},
}
java_library {
name: "core.module_lib.stubs.from-source",
defaults: [
"core.module_lib.stubs.defaults",
],
static_libs: [ static_libs: [
"art.module.public.api.stubs.module_lib", "art.module.public.api.stubs.module_lib",
@@ -161,9 +192,6 @@ java_library {
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"i18n.module.public.api.stubs", "i18n.module.public.api.stubs",
], ],
sdk_version: "none",
system_modules: "none",
visibility: ["//visibility:private"],
} }
// Produces a dist file that is used by the // Produces a dist file that is used by the
@@ -249,10 +277,10 @@ java_library {
product_variables: { product_variables: {
build_from_text_stub: { build_from_text_stub: {
static_libs: [ static_libs: [
"stable.core.platform.api.stubs.from-text", "legacy.core.platform.api.stubs.from-text",
], ],
exclude_static_libs: [ exclude_static_libs: [
"stable.core.platform.api.stubs.from-source", "legacy.core.platform.api.stubs.from-source",
], ],
}, },
}, },

20
java/core-libraries/TxtStubLibraries.bp
View File

@@ -57,19 +57,23 @@ java_library {
], ],
} }
java_library { java_api_library {
name: "core.module_lib.stubs.from-text", name: "core.module_lib.stubs.from-text",
static_libs: [ api_surface: "module-lib",
"art.module.public.api.stubs.module_lib.from-text", 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",
// Replace the following with the module-lib correspondence when Conscrypt or i18N module // Add the module-lib correspondence when Conscrypt or i18N module
// provides @SystemApi(MODULE_LIBRARIES). Currently, assume that only ART module provides // provides @SystemApi(MODULE_LIBRARIES). Currently, assume that only ART module provides
// @SystemApi(MODULE_LIBRARIES). // @SystemApi(MODULE_LIBRARIES).
"conscrypt.module.public.api.stubs.from-text", "conscrypt.module.public.api.stubs.source.api.contribution",
"i18n.module.public.api.stubs.from-text", "i18n.module.public.api.stubs.source.api.contribution",
],
libs: [
"stub-annotations",
], ],
sdk_version: "none",
system_modules: "none",
visibility: ["//visibility:private"], visibility: ["//visibility:private"],
} }