commit be2037d573f667748c899fee1818bb457583cdbe
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 02 16:46:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 02 16:46:35 2020 +0000
tree e0a5612348e57f5a28acaaf83b2b723dd5b28173
parent 13308eb260953e8d7546af4ec60942f8487e914c
parent 9c165d327020070749056adc3d5c2c848660946f

Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c21 am: 0b80c491ae am: b057c6ec81 am: 9c165d3270

Change-Id: I6e03a644faa48ffcd53b3ba21aa90fa68fbb9e2b

apex/media/framework/Android.bp

diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 48e7ec7..a1c886a 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -49,6 +49,7 @@
         "com.android.media",
         "test_com.android.media",
     ],
+    min_sdk_version: "29",
 }
 
 filegroup {

packages/CtsShim/build/Android.bp

diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index d41c672..43e3868 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -79,6 +79,7 @@
         "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
+    min_sdk_version: "24",
 }
 
 //##########################################################
@@ -152,4 +153,5 @@
         "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
+    min_sdk_version: "24",
 }