aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2022-09-08 15:31:22 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2022-09-08 15:31:22 +0000
commit1954def94824419b59a2f642e6fe80b07ed40a5f (patch)
treebf6b82b6c593723fb1be4e6c510187b1ea2f4ca3
parentaee4fbb92dbb298ab2ba920e7ed2d15e1fc929b9 (diff)
parent1d0a8dffea16f0af8eafee72f5bc041813f06d89 (diff)
downloadleveldb-1954def94824419b59a2f642e6fe80b07ed40a5f.tar.gz
[automerge] Add com.android.mediaprovider in apex_available and min_sdk_version 2p: 1d0a8dffea
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/leveldb/+/19732516 Bug: 239414704 Change-Id: I0474c0131c20d75dc986c8ebab17b3ad65cc6bc6
-rw-r--r--Android.bp4
-rw-r--r--TEST_MAPPING7
2 files changed, 10 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index fd8e32f..a91b119 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,6 +46,7 @@ cc_defaults {
"-Wno-unused-variable",
],
sdk_version: "current",
+ min_sdk_version: "30",
}
cc_library {
@@ -55,6 +56,9 @@ cc_library {
],
export_include_dirs: ["include/"],
visibility: ["//packages/providers/MediaProvider/jni"],
+ apex_available: [
+ "com.android.mediaprovider",
+ ],
srcs: [
"db/builder.cc",
"db/c.cc",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index c45ea6a..49b2742 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
{
- "presubmit":[
+ "mainline-presubmit": [
+ {
+ "name": "leveldb_test[com.google.android.mediaprovider.apex]"
+ }
+ ],
+ "presubmit": [
{
"name":"leveldb_test"
}