Merge SP1A.211205.008
Bug: 205056467
Merged-In: Ide8f0de5854f58e51cd7cff62351652189aed432
Change-Id: I9a2be00270fd09385b6121fda8cac475d3d4f7cb
diff --git a/current/Android.bp b/current/Android.bp
index 6b21395..cafef83 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -32,7 +32,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -72,6 +72,7 @@
stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/public/android.net.ipsec.ike.txt",
removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+ annotations: "sdk_library/public/android.net.ipsec.ike_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -79,6 +80,7 @@
stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/system/android.net.ipsec.ike.txt",
removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+ annotations: "sdk_library/system/android.net.ipsec.ike_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -86,13 +88,14 @@
stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
+ annotations: "sdk_library/module-lib/android.net.ipsec.ike_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "android.net.ipsec.ike",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -116,6 +119,7 @@
stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/public/android.net.ipsec.ike.txt",
removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+ annotations: "sdk_library/public/android.net.ipsec.ike_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -123,6 +127,7 @@
stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/system/android.net.ipsec.ike.txt",
removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+ annotations: "sdk_library/system/android.net.ipsec.ike_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -130,6 +135,7 @@
stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
+ annotations: "sdk_library/module-lib/android.net.ipsec.ike_annotations.zip",
sdk_version: "module_current",
},
}
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
new file mode 100644
index 0000000..0d3e591
--- /dev/null
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/android.net.ipsec.ike_annotations.zip b/current/sdk_library/public/android.net.ipsec.ike_annotations.zip
new file mode 100644
index 0000000..841f685
--- /dev/null
+++ b/current/sdk_library/public/android.net.ipsec.ike_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
new file mode 100644
index 0000000..0d3e591
--- /dev/null
+++ b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
Binary files differ
