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

Revert "Enable from-text stub generation in non-sdk java_sdk_library"

Browse Source 
Revert submission 2982300-java_api_library_non_sdk

Reason for revert: DroidMonitor: Potential culprit for b/357648959 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2982300-java_api_library_non_sdk

Change-Id: I5ef7afd9ec3e10ea99f82d02172843ad9b2cfda9
This commit is contained in:
Liana Kazanova
2024-08-05 19:45:03 +00:00
committed by Gerrit Code Review
parent 062eb663c5
commit a574cd28a8
8 changed files with 444 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ java_defaults {
}
java_library {
name: "core.current.stubs",
name: "core.current.stubs.from-source",
defaults: [
"core.current.stubs.defaults",
],
@@ -52,12 +52,8 @@ java_library {
],
}
// Used for bootstrapping ART system modules
java_api_library {
name: "core.current.stubs.from-text",
defaults: [
"core.current.stubs.defaults",
],
api_surface: "core",
api_contributions: [
"art.module.public.api.stubs.source.api.contribution",
@@ -72,7 +68,27 @@ java_api_library {
}
java_library {
name: "core.current.stubs.exportable",
name: "core.current.stubs",
defaults: [
"core.current.stubs.defaults",
],
static_libs: [
"core.current.stubs.from-source",
],
product_variables: {
build_from_text_stub: {
static_libs: [
"core.current.stubs.from-text",
],
exclude_static_libs: [
"core.current.stubs.from-source",
],
},
},
}
java_library {
name: "core.current.stubs.exportable.from-source",
defaults: [
"core.current.stubs.defaults",
],
@@ -87,6 +103,16 @@ java_library {
},
}
java_library {
name: "core.current.stubs.exportable",
defaults: [
"core.current.stubs.defaults",
],
static_libs: [
"core.current.stubs.exportable.from-source",
],
}
// Distributed with the SDK for turning into system modules to compile apps
// against.
//
@@ -174,6 +200,26 @@ java_library {
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: [
"art.module.public.api.stubs.module_lib",
@@ -185,6 +231,27 @@ java_library {
],
}
java_api_library {
name: "core.module_lib.stubs.from-text",
api_surface: "module-lib",
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",
// Add the module-lib correspondence when Conscrypt or i18N module
// provides @SystemApi(MODULE_LIBRARIES). Currently, assume that only ART module provides
// @SystemApi(MODULE_LIBRARIES).
"conscrypt.module.public.api.stubs.source.api.contribution",
"i18n.module.public.api.stubs.source.api.contribution",
],
libs: [
"stub-annotations",
],
visibility: ["//visibility:private"],
stubs_type: "everything",
}
// Produces a dist file that is used by the
// prebuilts/sdk/update_prebuilts.py script to update the prebuilts/sdk
// directory.
@@ -244,7 +311,7 @@ core_platform_visibility = ["//visibility:public"]
// API annotations are available to the dex tools that enable enforcement of runtime
// accessibility. b/119068555
java_library {
name: "legacy.core.platform.api.stubs",
name: "legacy.core.platform.api.stubs.from-source",
visibility: core_platform_visibility,
defaults: [
"core.platform.api.stubs.defaults",
@@ -257,7 +324,7 @@ java_library {
}
java_library {
name: "legacy.core.platform.api.stubs.exportable",
name: "legacy.core.platform.api.stubs.exportable.from-source",
visibility: core_platform_visibility,
defaults: [
"core.platform.api.stubs.defaults",
@@ -281,6 +348,53 @@ java_defaults {
],
}
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",
],
stubs_type: "everything",
}
java_library {
name: "legacy.core.platform.api.stubs",
visibility: core_platform_visibility,
defaults: [
"core.platform.api.stubs.defaults",
],
static_libs: [
"legacy.core.platform.api.stubs.from-source",
],
product_variables: {
build_from_text_stub: {
static_libs: [
"legacy.core.platform.api.stubs.from-text",
],
exclude_static_libs: [
"legacy.core.platform.api.stubs.from-source",
],
},
},
}
java_library {
name: "legacy.core.platform.api.stubs.exportable",
visibility: core_platform_visibility,
defaults: [
"core.platform.api.stubs.defaults",
],
static_libs: [
"legacy.core.platform.api.stubs.exportable.from-source",
],
}
java_defaults {
name: "core.platform.api.stubs.defaults",
hostdex: true,
@@ -310,7 +424,7 @@ java_library {
}
java_library {
name: "stable.core.platform.api.stubs",
name: "stable.core.platform.api.stubs.from-source",
visibility: core_platform_visibility,
defaults: [
"core.platform.api.stubs.defaults",
@@ -323,6 +437,42 @@ 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",
],
stubs_type: "everything",
}
java_library {
name: "stable.core.platform.api.stubs",
visibility: core_platform_visibility,
defaults: [
"core.platform.api.stubs.defaults",
],
static_libs: [
"stable.core.platform.api.stubs.from-source",
],
product_variables: {
build_from_text_stub: {
static_libs: [
"stable.core.platform.api.stubs.from-text",
],
exclude_static_libs: [
"stable.core.platform.api.stubs.from-source",
],
},
},
}
// Same as stable.core.platform.api.stubs, but android annotations are
// stripped. This is used by the Java toolchain, while the annotated stub is to
// be used by Kotlin one.