Merge SP1A.211205.008
Bug: 205056467
Merged-In: Ie8480c46c91ffa756edb2c85fc565d2e1d1504a5
Change-Id: Ie03100954fd3e6bc8cd0b134aad8f62770a88395
diff --git a/current/Android.bp b/current/Android.bp
index efc6ae3..4cd2380 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -35,7 +35,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.wifi-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -77,6 +77,7 @@
stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
current_api: "sdk_library/public/framework-wifi.txt",
removed_api: "sdk_library/public/framework-wifi-removed.txt",
+ annotations: "sdk_library/public/framework-wifi_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -84,6 +85,7 @@
stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
current_api: "sdk_library/system/framework-wifi.txt",
removed_api: "sdk_library/system/framework-wifi-removed.txt",
+ annotations: "sdk_library/system/framework-wifi_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -91,13 +93,14 @@
stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
current_api: "sdk_library/module-lib/framework-wifi.txt",
removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+ annotations: "sdk_library/module-lib/framework-wifi_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-wifi",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -120,6 +123,7 @@
stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
current_api: "sdk_library/public/framework-wifi.txt",
removed_api: "sdk_library/public/framework-wifi-removed.txt",
+ annotations: "sdk_library/public/framework-wifi_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -127,6 +131,7 @@
stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
current_api: "sdk_library/system/framework-wifi.txt",
removed_api: "sdk_library/system/framework-wifi-removed.txt",
+ annotations: "sdk_library/system/framework-wifi_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -134,6 +139,7 @@
stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
current_api: "sdk_library/module-lib/framework-wifi.txt",
removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+ annotations: "sdk_library/module-lib/framework-wifi_annotations.zip",
sdk_version: "module_current",
},
}
diff --git a/current/sdk_library/module-lib/framework-wifi_annotations.zip b/current/sdk_library/module-lib/framework-wifi_annotations.zip
new file mode 100644
index 0000000..68ea3ac
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-wifi_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi_annotations.zip b/current/sdk_library/public/framework-wifi_annotations.zip
new file mode 100644
index 0000000..80b245b
--- /dev/null
+++ b/current/sdk_library/public/framework-wifi_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-wifi_annotations.zip b/current/sdk_library/system/framework-wifi_annotations.zip
new file mode 100644
index 0000000..68ea3ac
--- /dev/null
+++ b/current/sdk_library/system/framework-wifi_annotations.zip
Binary files differ
