Merge SP1A.211205.008
Bug: 205056467
Merged-In: I497cc8fa38bf0cc7103b5088c08e4f448cf9d928
Change-Id: Ibf879155a6b9f23f0be40f5d5ceb49293f9bba24
diff --git a/current/Android.bp b/current/Android.bp
index 969e5e5..d406a4a 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -33,7 +33,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.mediaprovider-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -69,6 +69,7 @@
stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
current_api: "sdk_library/public/framework-mediaprovider.txt",
removed_api: "sdk_library/public/framework-mediaprovider-removed.txt",
+ annotations: "sdk_library/public/framework-mediaprovider_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -76,6 +77,7 @@
stub_srcs: ["sdk_library/system/framework-mediaprovider.srcjar"],
current_api: "sdk_library/system/framework-mediaprovider.txt",
removed_api: "sdk_library/system/framework-mediaprovider-removed.txt",
+ annotations: "sdk_library/system/framework-mediaprovider_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -83,13 +85,14 @@
stub_srcs: ["sdk_library/module-lib/framework-mediaprovider.srcjar"],
current_api: "sdk_library/module-lib/framework-mediaprovider.txt",
removed_api: "sdk_library/module-lib/framework-mediaprovider-removed.txt",
+ annotations: "sdk_library/module-lib/framework-mediaprovider_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-mediaprovider",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -108,6 +111,7 @@
stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
current_api: "sdk_library/public/framework-mediaprovider.txt",
removed_api: "sdk_library/public/framework-mediaprovider-removed.txt",
+ annotations: "sdk_library/public/framework-mediaprovider_annotations.zip",
sdk_version: "module_current",
},
system: {
@@ -115,6 +119,7 @@
stub_srcs: ["sdk_library/system/framework-mediaprovider.srcjar"],
current_api: "sdk_library/system/framework-mediaprovider.txt",
removed_api: "sdk_library/system/framework-mediaprovider-removed.txt",
+ annotations: "sdk_library/system/framework-mediaprovider_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
@@ -122,6 +127,7 @@
stub_srcs: ["sdk_library/module-lib/framework-mediaprovider.srcjar"],
current_api: "sdk_library/module-lib/framework-mediaprovider.txt",
removed_api: "sdk_library/module-lib/framework-mediaprovider-removed.txt",
+ annotations: "sdk_library/module-lib/framework-mediaprovider_annotations.zip",
sdk_version: "module_current",
},
}
diff --git a/current/sdk_library/module-lib/framework-mediaprovider_annotations.zip b/current/sdk_library/module-lib/framework-mediaprovider_annotations.zip
new file mode 100644
index 0000000..ebd4a81
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-mediaprovider_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-mediaprovider_annotations.zip b/current/sdk_library/public/framework-mediaprovider_annotations.zip
new file mode 100644
index 0000000..feffcba
--- /dev/null
+++ b/current/sdk_library/public/framework-mediaprovider_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-mediaprovider_annotations.zip b/current/sdk_library/system/framework-mediaprovider_annotations.zip
new file mode 100644
index 0000000..ebd4a81
--- /dev/null
+++ b/current/sdk_library/system/framework-mediaprovider_annotations.zip
Binary files differ
