summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-03-09 19:14:28 +0000
committerAnton Hansson <hansson@google.com>2020-03-16 15:52:34 +0000
commit4d90a280d6093fd1b25f3541446ef8e7a42efdbf (patch)
tree7988715ffaa7c861a9c08b97c1f185e3b141ef49
parent4637a72f05f5644c44c9f523c71ea98c102017af (diff)
Put sdk_version in module stub defaults
Makes it easier to change when every module isn't specifying how the stubs are built. Also make wifi stubs build against the appropriate api surface, which works around a bug. Bug: 147768409 Bug: 151134996 Test: m Change-Id: I91db06ef932a73002b4fe232566f5d111baef432 Merged-In: I91db06ef932a73002b4fe232566f5d111baef432
-rw-r--r--apex/Android.bp4
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/Android.bp b/apex/Android.bp
index 051986e758d3..151091137c9c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -43,6 +43,7 @@ stubs_defaults {
name: "framework-module-stubs-defaults-publicapi",
args: mainline_stubs_args,
installable: false,
+ sdk_version: "current",
}
stubs_defaults {
@@ -50,6 +51,7 @@ stubs_defaults {
args: mainline_stubs_args + priv_apps,
srcs: [":framework-annotations"],
installable: false,
+ sdk_version: "system_current",
}
// 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,
srcs: [":framework-annotations"],
installable: false,
+ sdk_version: "module_current",
}
stubs_defaults {
@@ -69,4 +72,5 @@ stubs_defaults {
args: mainline_stubs_args + module_libs + priv_apps,
srcs: [":framework-annotations"],
installable: false,
+ sdk_version: "module_current",
}