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

Merge "Put sdk_version in module stub defaults" into rvc-dev

Browse Source
This commit is contained in:
Anton Hansson
2020-03-11 10:12:59 +00:00
committed by Android (Google) Code Review
parent 28aa900400 1527353675
commit 261e944b0f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/Android.bp
View File

@@ -43,6 +43,7 @@ stubs_defaults {
name: "framework-module-stubs-defaults-publicapi", name: "framework-module-stubs-defaults-publicapi",
args: mainline_stubs_args, args: mainline_stubs_args,
installable: false, installable: false,
sdk_version: "current",
} }
stubs_defaults { stubs_defaults {
@@ -50,6 +51,7 @@ stubs_defaults {
args: mainline_stubs_args + priv_apps, args: mainline_stubs_args + priv_apps,
srcs: [":framework-annotations"], srcs: [":framework-annotations"],
installable: false, installable: false,
sdk_version: "system_current",
} }
// The defaults for module_libs comes in two parts - defaults for API checks // The defaults for module_libs comes in two parts - defaults for API checks
@@ -62,6 +64,7 @@ stubs_defaults {
args: mainline_stubs_args + module_libs, args: mainline_stubs_args + module_libs,
srcs: [":framework-annotations"], srcs: [":framework-annotations"],
installable: false, installable: false,
sdk_version: "module_current",
} }
stubs_defaults { stubs_defaults {
@@ -69,4 +72,5 @@ stubs_defaults {
args: mainline_stubs_args + module_libs + priv_apps, args: mainline_stubs_args + module_libs + priv_apps,
srcs: [":framework-annotations"], srcs: [":framework-annotations"],
installable: false, installable: false,
sdk_version: "module_current",
} }

4
wifi/Android.bp
View File

@@ -177,14 +177,14 @@ droidstubs {
java_library { java_library {
name: "framework-wifi-stubs-publicapi", name: "framework-wifi-stubs-publicapi",
srcs: [":framework-wifi-stubs-srcs-publicapi"], srcs: [":framework-wifi-stubs-srcs-publicapi"],
sdk_version: "module_current", sdk_version: "current",
installable: false, installable: false,
} }
java_library { java_library {
name: "framework-wifi-stubs-systemapi", name: "framework-wifi-stubs-systemapi",
srcs: [":framework-wifi-stubs-srcs-systemapi"], srcs: [":framework-wifi-stubs-srcs-systemapi"],
sdk_version: "module_current", sdk_version: "system_current",
libs: ["framework-annotations-lib"], libs: ["framework-annotations-lib"],
installable: false, installable: false,
} }