Merge SP1A.211205.008
Bug: 205056467
Merged-In: Icce727d3b9a1b17231b1a8a9b6176e526b428cc1
Change-Id: Ieb43997e7c9e136361270fb086701676855adaec
diff --git a/current/Android.bp b/current/Android.bp
index 848398b..aa7e126 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -37,7 +37,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.tethering-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -74,6 +74,7 @@
stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
current_api: "sdk_library/public/framework-connectivity.txt",
removed_api: "sdk_library/public/framework-connectivity-removed.txt",
+ annotations: "sdk_library/public/framework-connectivity_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -81,6 +82,7 @@
stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"],
current_api: "sdk_library/system/framework-connectivity.txt",
removed_api: "sdk_library/system/framework-connectivity-removed.txt",
+ annotations: "sdk_library/system/framework-connectivity_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -88,13 +90,14 @@
stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"],
current_api: "sdk_library/module-lib/framework-connectivity.txt",
removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt",
+ annotations: "sdk_library/module-lib/framework-connectivity_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-connectivity",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -110,6 +113,7 @@
stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
current_api: "sdk_library/public/framework-connectivity.txt",
removed_api: "sdk_library/public/framework-connectivity-removed.txt",
+ annotations: "sdk_library/public/framework-connectivity_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -117,6 +121,7 @@
stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"],
current_api: "sdk_library/system/framework-connectivity.txt",
removed_api: "sdk_library/system/framework-connectivity-removed.txt",
+ annotations: "sdk_library/system/framework-connectivity_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -124,6 +129,7 @@
stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"],
current_api: "sdk_library/module-lib/framework-connectivity.txt",
removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt",
+ annotations: "sdk_library/module-lib/framework-connectivity_annotations.zip",
sdk_version: "module_current",
},
}
@@ -141,6 +147,7 @@
stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
current_api: "sdk_library/public/framework-tethering.txt",
removed_api: "sdk_library/public/framework-tethering-removed.txt",
+ annotations: "sdk_library/public/framework-tethering_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -148,6 +155,7 @@
stub_srcs: ["sdk_library/system/framework-tethering.srcjar"],
current_api: "sdk_library/system/framework-tethering.txt",
removed_api: "sdk_library/system/framework-tethering-removed.txt",
+ annotations: "sdk_library/system/framework-tethering_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -155,13 +163,14 @@
stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"],
current_api: "sdk_library/module-lib/framework-tethering.txt",
removed_api: "sdk_library/module-lib/framework-tethering-removed.txt",
+ annotations: "sdk_library/module-lib/framework-tethering_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-tethering",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -177,6 +186,7 @@
stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
current_api: "sdk_library/public/framework-tethering.txt",
removed_api: "sdk_library/public/framework-tethering-removed.txt",
+ annotations: "sdk_library/public/framework-tethering_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -184,6 +194,7 @@
stub_srcs: ["sdk_library/system/framework-tethering.srcjar"],
current_api: "sdk_library/system/framework-tethering.txt",
removed_api: "sdk_library/system/framework-tethering-removed.txt",
+ annotations: "sdk_library/system/framework-tethering_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -191,6 +202,7 @@
stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"],
current_api: "sdk_library/module-lib/framework-tethering.txt",
removed_api: "sdk_library/module-lib/framework-tethering-removed.txt",
+ annotations: "sdk_library/module-lib/framework-tethering_annotations.zip",
sdk_version: "module_current",
},
}
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..4f106df
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-tethering_annotations.zip b/current/sdk_library/module-lib/framework-tethering_annotations.zip
new file mode 100644
index 0000000..3dabacc
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-tethering_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-connectivity_annotations.zip b/current/sdk_library/public/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..35d11ca
--- /dev/null
+++ b/current/sdk_library/public/framework-connectivity_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-tethering_annotations.zip b/current/sdk_library/public/framework-tethering_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-tethering_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-connectivity_annotations.zip b/current/sdk_library/system/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..f7b7020
--- /dev/null
+++ b/current/sdk_library/system/framework-connectivity_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-tethering_annotations.zip b/current/sdk_library/system/framework-tethering_annotations.zip
new file mode 100644
index 0000000..d3235a5
--- /dev/null
+++ b/current/sdk_library/system/framework-tethering_annotations.zip
Binary files differ
