commit 7330c5b0a550fbb7540f648314960a0bd9d410b8
author Jeffrey Huang <jeffreyhuang@google.com> Wed Mar 17 13:10:43 2021 -0700
committer Jeffrey Huang <jeffreyhuang@google.com> Tue Mar 23 15:15:17 2021 -0700
tree 27e0b2650870c3517710ab478645d4f6692acd4b
parent 190e1d92c7bf4cc0514c44be211b54bab368033d

Allow CtsUtilTestCases to run on R devices

Bug: 182008234
Test: atest CtsUtilTestCases
Change-Id: I7a7fb6923c97f4a158dd4c1c151c305169f57be1

tests/tests/util/Android.bp

diff --git a/tests/tests/util/Android.bp b/tests/tests/util/Android.bp
index 0c5de3a..3998282 100644
--- a/tests/tests/util/Android.bp
+++ b/tests/tests/util/Android.bp
@@ -34,4 +34,5 @@
     ],
     srcs: ["src/**/*.java"],
     platform_apis: true,
+    min_sdk_version: "30",
 }

tests/tests/util/AndroidManifest.xml

diff --git a/tests/tests/util/AndroidManifest.xml b/tests/tests/util/AndroidManifest.xml
index 77ab380..10de8ef 100644
--- a/tests/tests/util/AndroidManifest.xml
+++ b/tests/tests/util/AndroidManifest.xml
@@ -26,6 +26,8 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
+
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                      android:targetPackage="android.util.cts"
                      android:label="CTS tests of android.util">