summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpandan Das <spandandas@google.com>2024-01-04 17:43:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-01-04 17:43:31 +0000
commit0e8213506c1c667144a5916f776250462832ad0c (patch)
tree2fdb7d3391ef29f1b09bd264c15b79862c12114b
parentec6af815a0976b22c87a930b876b090188f340a0 (diff)
parent1abbb5618cc69124596c7e2d213d8dcd5ab796f7 (diff)
downloadMediaProvider-0e8213506c1c667144a5916f776250462832ad0c.tar.gz
Merge "Make apex availability of MediaProvider and libfuse_jni explicit" into main
-rw-r--r--Android.bp4
-rw-r--r--jni/Android.bp3
2 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index c699f7608..044dbd749 100644
--- a/Android.bp
+++ b/Android.bp
@@ -95,6 +95,10 @@ android_app {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
+
+ apex_available: [
+ "com.android.mediaprovider",
+ ],
}
// Used by MediaProvider and MediaProviderTests
diff --git a/jni/Android.bp b/jni/Android.bp
index 35721d5a6..71b51188a 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -71,6 +71,9 @@ cc_library_shared {
sdk_version: "current",
stl: "c++_static",
min_sdk_version: "30",
+ apex_available: [
+ "com.android.mediaprovider",
+ ],
}
cc_test {