Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: Id2437a4e08802fa9cc21d9ed0d9ea03ab15d618b
Change-Id: I44bd5b37f119442aee02dd5559fb437dafa1dab5
diff --git a/current/Android.bp b/current/Android.bp
index 0e28b2d..0184fd8 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -64,6 +64,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: {
@@ -71,6 +72,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: {
@@ -78,6 +80,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",
},
}
@@ -102,6 +105,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: {
@@ -109,6 +113,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: {
@@ -116,6 +121,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