drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Compile android-non-updatable separately"

Browse Source
This commit is contained in:
Anton Hansson
2021-04-12 08:30:18 +00:00
committed by Gerrit Code Review
parent ad274e531a a4748cd10d
commit e4d95a9e15
1 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
StubLibraries.bp
View File

@ -299,13 +299,9 @@ modules_system_stubs = [
] ]
java_defaults { java_defaults {
name: "android_defaults_stubs_current", name: "android-non-updatable_defaults_stubs_current",
libs: [ "stub-annotations" ], libs: ["stub-annotations"],
static_libs: [ static_libs: ["framework-res-package-jar"], // Export package of framework-res
// License notices from art module
"art-notices-for-framework-stubs-jar",
"framework-res-package-jar", // Export package of framework-res
],
errorprone: { errorprone: {
javacflags: [ javacflags: [
"-XepDisableAllChecks", "-XepDisableAllChecks",
@ -317,6 +313,47 @@ java_defaults {
compile_dex: true, compile_dex: true,
} }
java_library_static {
name: "android-non-updatable.stubs",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":api-stubs-docs-non-updatable"],
libs: modules_public_stubs,
}
java_library_static {
name: "android-non-updatable.stubs.system",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [ ":system-api-stubs-docs-non-updatable" ],
libs: modules_system_stubs,
}
java_library_static {
name: "android-non-updatable.stubs.module_lib",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":module-lib-api-stubs-docs-non-updatable"],
libs: [
"sdk_system_current_android",
// NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike",
],
}
java_library_static {
name: "android-non-updatable.stubs.test",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":test-api-stubs-docs-non-updatable"],
libs: modules_system_stubs,
}
java_defaults {
name: "android_defaults_stubs_current",
static_libs: ["art-notices-for-framework-stubs-jar"], // License notices from art module
sdk_version: "none",
system_modules: "none",
java_version: "1.8",
compile_dex: true,
}
java_defaults { java_defaults {
name: "android_stubs_dists_default", name: "android_stubs_dists_default",
dist: { dist: {
@ -328,8 +365,8 @@ java_defaults {
java_library_static { java_library_static {
name: "android_stubs_current", name: "android_stubs_current",
srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: modules_public_stubs + [ static_libs: modules_public_stubs + [
"android-non-updatable.stubs",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: ["android_defaults_stubs_current"], defaults: ["android_defaults_stubs_current"],
@ -337,8 +374,8 @@ java_library_static {
java_library_static { java_library_static {
name: "android_system_stubs_current", name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: modules_system_stubs + [ static_libs: modules_system_stubs + [
"android-non-updatable.stubs.system",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: [ defaults: [
@ -360,10 +397,10 @@ java_library_static {
java_library_static { java_library_static {
name: "android_test_stubs_current", name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs-non-updatable" ],
// Modules do not have test APIs, but we want to include their SystemApis, like we include // Modules do not have test APIs, but we want to include their SystemApis, like we include
// the SystemApi of framework-non-updatable-sources. // the SystemApi of framework-non-updatable-sources.
static_libs: modules_system_stubs + [ static_libs: modules_system_stubs + [
"android-non-updatable.stubs.test",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: [ defaults: [
@ -385,17 +422,14 @@ java_library_static {
java_library_static { java_library_static {
name: "android_module_lib_stubs_current", name: "android_module_lib_stubs_current",
srcs: [ ":module-lib-api-stubs-docs-non-updatable" ],
defaults: [ defaults: [
"android_defaults_stubs_current", "android_defaults_stubs_current",
"android_stubs_dists_default", "android_stubs_dists_default",
], ],
libs: [ static_libs: [
"sdk_system_current_android", "android-non-updatable.stubs.module_lib",
// NOTE: The below can be removed once the prebuilt stub contains IKE. "art.module.public.api.stubs",
"sdk_system_current_android.net.ipsec.ike",
], ],
static_libs: ["art.module.public.api.stubs"],
dist: { dist: {
dir: "apistubs/android/module-lib", dir: "apistubs/android/module-lib",
}, },