From 1527353675547cd414e4f5086569c9d949581a5d Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 9 Mar 2020 19:14:28 +0000
Subject: [PATCH] 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
---
 apex/Android.bp | 4 ++++
 wifi/Android.bp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apex/Android.bp b/apex/Android.bp
index 051986e758d38..151091137c9ce 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",
 }
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 91174d3c3be2d..f4d28817a7f2e 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -177,14 +177,14 @@ droidstubs {
 java_library {
     name: "framework-wifi-stubs-publicapi",
     srcs: [":framework-wifi-stubs-srcs-publicapi"],
-    sdk_version: "module_current",
+    sdk_version: "current",
     installable: false,
 }
 
 java_library {
     name: "framework-wifi-stubs-systemapi",
     srcs: [":framework-wifi-stubs-srcs-systemapi"],
-    sdk_version: "module_current",
+    sdk_version: "system_current",
     libs: ["framework-annotations-lib"],
     installable: false,
 }