Merge SP1A.211205.008
Bug: 205056467
Merged-In: I49e5f7c9e1cfbb6cb7250f295cbf3908007faf42
Change-Id: I28a15c5692f3e9f3279ec714b28c88a6731680dc
diff --git a/current/Android.bp b/current/Android.bp
index c7626d3..91e398f 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -32,7 +32,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.sdkext-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -67,6 +67,7 @@
stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],
current_api: "sdk_library/public/framework-sdkextensions.txt",
removed_api: "sdk_library/public/framework-sdkextensions-removed.txt",
+ annotations: "sdk_library/public/framework-sdkextensions_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -74,6 +75,7 @@
stub_srcs: ["sdk_library/system/framework-sdkextensions.srcjar"],
current_api: "sdk_library/system/framework-sdkextensions.txt",
removed_api: "sdk_library/system/framework-sdkextensions-removed.txt",
+ annotations: "sdk_library/system/framework-sdkextensions_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -81,13 +83,14 @@
stub_srcs: ["sdk_library/module-lib/framework-sdkextensions.srcjar"],
current_api: "sdk_library/module-lib/framework-sdkextensions.txt",
removed_api: "sdk_library/module-lib/framework-sdkextensions-removed.txt",
+ annotations: "sdk_library/module-lib/framework-sdkextensions_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-sdkextensions",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -106,6 +109,7 @@
stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],
current_api: "sdk_library/public/framework-sdkextensions.txt",
removed_api: "sdk_library/public/framework-sdkextensions-removed.txt",
+ annotations: "sdk_library/public/framework-sdkextensions_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -113,6 +117,7 @@
stub_srcs: ["sdk_library/system/framework-sdkextensions.srcjar"],
current_api: "sdk_library/system/framework-sdkextensions.txt",
removed_api: "sdk_library/system/framework-sdkextensions-removed.txt",
+ annotations: "sdk_library/system/framework-sdkextensions_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -120,6 +125,7 @@
stub_srcs: ["sdk_library/module-lib/framework-sdkextensions.srcjar"],
current_api: "sdk_library/module-lib/framework-sdkextensions.txt",
removed_api: "sdk_library/module-lib/framework-sdkextensions-removed.txt",
+ annotations: "sdk_library/module-lib/framework-sdkextensions_annotations.zip",
sdk_version: "module_current",
},
}
diff --git a/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip b/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
new file mode 100644
index 0000000..273bfb1
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-sdkextensions_annotations.zip b/current/sdk_library/public/framework-sdkextensions_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-sdkextensions_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-sdkextensions_annotations.zip b/current/sdk_library/system/framework-sdkextensions_annotations.zip
new file mode 100644
index 0000000..273bfb1
--- /dev/null
+++ b/current/sdk_library/system/framework-sdkextensions_annotations.zip
Binary files differ
