Use sdk_version: none for platform stubs

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

View File

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