summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-05-02 15:36:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-05-02 15:36:33 +0000
commitcbbc9c5c2142e12be1e2bfbd52814ee908992b5d (patch)
tree5b54ba2aef87fed2da6d9ce613b62f10d4d72f85
parentcdb1ce47f98ee37b0e2cb84ccc0cf25e2dfb2775 (diff)
parent88dcf0f5e21d531302f198aa7b22df27b695dde4 (diff)
Merge changes I82cecd20,I2b4e41a4 into rvc-dev
* changes: updatable-media: Set min_sdk_version Set min_sdk_version to be part of mainline modules
-rw-r--r--apex/media/framework/Android.bp1
-rw-r--r--packages/CtsShim/build/Android.bp2
2 files changed, 3 insertions, 0 deletions
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 48e7ec760f97..a1c886a26562 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -49,6 +49,7 @@ java_library {
"com.android.media",
"test_com.android.media",
],
+ min_sdk_version: "29",
}
filegroup {
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index d41c6728559b..43e386852713 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -79,6 +79,7 @@ android_app {
"com.android.apex.cts.shim.v2_unsigned_payload",
"com.android.apex.cts.shim.v3",
],
+ min_sdk_version: "24",
}
//##########################################################
@@ -152,4 +153,5 @@ android_app {
"com.android.apex.cts.shim.v2_unsigned_payload",
"com.android.apex.cts.shim.v3",
],
+ min_sdk_version: "24",
}