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

Merge "Use sdk_version: none for platform stubs" into rvc-dev

Browse Source
This commit is contained in:
Anton Hansson
2020-04-10 18:53:30 +00:00
committed by Android (Google) Code Review
parent 1886acb2c4 87c7d28881
commit a31590bb4a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
StubLibraries.bp
View File

@@ -256,18 +256,16 @@ droidstubs {
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
java_defaults { java_defaults {
name: "framework-stubs-default", name: "android_defaults_stubs_current",
libs: [ "stub-annotations" ], libs: [ "stub-annotations" ],
static_libs: [ "private-stub-annotations-jar" ], static_libs: [ "private-stub-annotations-jar" ],
sdk_version: "core_current",
errorprone: { errorprone: {
javacflags: [ javacflags: [
"-XepDisableAllChecks", "-XepDisableAllChecks",
], ],
}, },
java_resources: [ java_resources: [":notices-for-framework-stubs"],
":notices-for-framework-stubs", sdk_version: "none",
],
system_modules: "none", system_modules: "none",
java_version: "1.8", java_version: "1.8",
compile_dex: true, compile_dex: true,
@@ -276,25 +274,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"],
} }