summaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-07 23:50:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-07 23:50:48 +0000
commit65c8bd6f10fa52c110caa4e95eef9193e7b604c8 (patch)
treee82cb75a38776840eb3954ddefe2782c4c7f4291 /Android.bp
parent2fb199ae6dbce46353833a508d33745bd4cff23d (diff)
parent8b4f9d9b74f051da6b377ae3147cc36d599afc5f (diff)
downloadplatform_packages_providers_MediaProvider-master.tar.gz
platform_packages_providers_MediaProvider-master.tar.bz2
platform_packages_providers_MediaProvider-master.zip
Merge "Merge Android 12"HEADmaster
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp17
1 files changed, 16 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 98264768..5547a615 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,7 @@ android_app {
"androidx.appcompat_appcompat",
"androidx.core_core",
"guava",
+ "modules-utils-build",
],
libs: [
@@ -32,6 +33,7 @@ android_app {
"app-compat-annotations",
"framework-annotations-lib",
"framework-mediaprovider.impl",
+ "framework-media.stubs.module_lib",
"framework-statsd",
],
@@ -56,8 +58,9 @@ android_app {
"error_prone_mediaprovider",
],
- min_sdk_version: "30",
sdk_version: "module_current",
+ min_sdk_version: "30",
+ target_sdk_version: "30",
certificate: "media",
privileged: true,
@@ -75,6 +78,8 @@ android_app {
"-Xep:MediaProviderMimeType:ERROR",
],
},
+
+ required: ["preinstalled-packages-com.android.providers.media.module.xml"],
}
// Used by MediaProvider and MediaProviderTests
@@ -99,11 +104,14 @@ java_library {
"src/com/android/providers/media/util/ForegroundThread.java",
"src/com/android/providers/media/util/Logging.java",
"src/com/android/providers/media/util/MimeUtils.java",
+ "src/com/android/providers/media/playlist/*.java",
],
sdk_version: "module_current",
min_sdk_version: "30",
static_libs: [
"modules-utils-backgroundthread",
+ "modules-utils-build",
+ "guava",
],
libs: [
"androidx.annotation_annotation",
@@ -125,3 +133,10 @@ genrule {
" --minApiLevel 30",
out: ["com/android/providers/media/MediaProviderStatsLog.java"],
}
+
+prebuilt_etc {
+ name: "preinstalled-packages-com.android.providers.media.module.xml",
+ src: "preinstalled-packages-com.android.providers.media.module.xml",
+ sub_dir: "sysconfig",
+}
+