Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use sdk_version: none for platform stubs

Browse Source 
These stubs contain the libcore sources inside them, so need not
compile against core_current.

Also rename the defaults rule to be in line with the new neverallow.

Bug: 144149403
Test: m
Change-Id: I5f1b01875b0073f942c692882db157a8c5788ce0
This commit is contained in:
Anton Hansson
2020-04-09 14:16:37 +01:00
parent a3b89694e7
commit fbd32f3274
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
StubLibraries.bp
View File

@@ -229,7 +229,7 @@ droidstubs {
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
java_defaults { java_defaults {
name: "framework-stubs-default", name: "android_defaults_stubs_current",
libs: [ "stub-annotations" ], libs: [ "stub-annotations" ],
static_libs: [ static_libs: [
"private-stub-annotations-jar", "private-stub-annotations-jar",
@@ -237,12 +237,12 @@ java_defaults {
// License notices from art module // License notices from art module
"art-notices-for-framework-stubs-jar", "art-notices-for-framework-stubs-jar",
], ],
sdk_version: "core_current",
errorprone: { errorprone: {
javacflags: [ javacflags: [
"-XepDisableAllChecks", "-XepDisableAllChecks",
], ],
}, },
sdk_version: "none",
system_modules: "none", system_modules: "none",
java_version: "1.8", java_version: "1.8",
compile_dex: true, compile_dex: true,
@@ -251,25 +251,25 @@ java_defaults {
java_library_static { java_library_static {
name: "android_stubs_current", name: "android_stubs_current",
srcs: [ ":api-stubs-docs" ], srcs: [ ":api-stubs-docs" ],
defaults: ["framework-stubs-default"], defaults: ["android_defaults_stubs_current"],
} }
java_library_static { java_library_static {
name: "android_system_stubs_current", name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs" ], srcs: [ ":system-api-stubs-docs" ],
defaults: ["framework-stubs-default"], defaults: ["android_defaults_stubs_current"],
} }
java_library_static { java_library_static {
name: "android_test_stubs_current", name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs" ], srcs: [ ":test-api-stubs-docs" ],
defaults: ["framework-stubs-default"], defaults: ["android_defaults_stubs_current"],
} }
java_library_static { java_library_static {
name: "android_module_lib_stubs_current", name: "android_module_lib_stubs_current",
srcs: [ ":module-lib-api-stubs-docs" ], srcs: [ ":module-lib-api-stubs-docs" ],
defaults: ["framework-stubs-default"], defaults: ["android_defaults_stubs_current"],
libs: ["android_system_stubs_current"], libs: ["android_system_stubs_current"],
} }