commit 6471882b77f265ffd04835a1fa31b1290b471d03
author Martijn Coenen <maco@google.com> Thu Feb 18 16:55:38 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 18 16:55:38 2021 +0000
tree 85ac4bd6350044e2a33395824efe13eb5c800034
parent dd32c25b04f0b4dc455013fab5f453eb6e961e66
parent 8a2c162ce9a022940b812e36e77b0d261d49eb3e

Merge "Mark the MediaProvider apex as updatable."

Android.bp

diff --git a/Android.bp b/Android.bp
index 481d4e8..b5a0a26 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,6 +38,7 @@
         "error_prone_mediaprovider",
     ],
 
+    min_sdk_version: "30",
     sdk_version: "module_current",
 
     certificate: "media",

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 631550f..5ca6822 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -8,6 +8,8 @@
 
 apex_defaults {
     name: "com.android.mediaprovider-defaults",
+    updatable: true,
+    min_sdk_version: "30",
     java_libs: ["framework-mediaprovider"],
     key: "com.android.mediaprovider.key",
     certificate: ":com.android.mediaprovider.certificate",

apex/framework/Android.bp

diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index cd2c5d1..305d65e 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -25,6 +25,7 @@
     ],
 
     installable: true,
+    min_sdk_version: "30",
 
     libs: [
         "framework_mediaprovider_annotation",

jni/Android.bp

diff --git a/jni/Android.bp b/jni/Android.bp
index 700b8c7..5ae5e54 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -60,6 +60,7 @@
         "-google-runtime-int",
     ],
 
+    min_sdk_version: "30",
     sdk_version: "current",
     stl: "c++_static",
 }