Add min_sdk_version to SdkExtension tests am: ffb7125d11
Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1622433
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c505b9d2eafa8e29339a441a3a36b5a1ff066a7
diff --git a/tests/cts/Android.bp b/tests/cts/Android.bp
index a9aac57..2bd6adc 100644
--- a/tests/cts/Android.bp
+++ b/tests/cts/Android.bp
@@ -32,4 +32,5 @@
"general-tests",
],
sdk_version: "system_current",
+ min_sdk_version: "30",
}
diff --git a/tests/cts/AndroidManifest.xml b/tests/cts/AndroidManifest.xml
index a6391b5..132bd32 100644
--- a/tests/cts/AndroidManifest.xml
+++ b/tests/cts/AndroidManifest.xml
@@ -18,6 +18,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.os.ext.cts">
+ <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
+
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="android.os.ext.cts"
android:label="CTS tests of android.os.ext">
diff --git a/tests/e2e/Android.bp b/tests/e2e/Android.bp
index 47400e3..a8f539e 100644
--- a/tests/e2e/Android.bp
+++ b/tests/e2e/Android.bp
@@ -40,4 +40,5 @@
srcs: ["app-src/**/*.java"],
libs: ["test_framework-sdkextensions-stubs"],
sdk_version: "system_current",
+ min_sdk_version: "30",
}
diff --git a/tests/e2e/apps-with-reqs/Android.bp b/tests/e2e/apps-with-reqs/Android.bp
index 2de4326..c293665 100644
--- a/tests/e2e/apps-with-reqs/Android.bp
+++ b/tests/e2e/apps-with-reqs/Android.bp
@@ -19,11 +19,13 @@
android_app {
name: "sdkextensions_e2e_test_app_req_r12",
sdk_version: "current",
- manifest: "AndroidManifest-r12.xml"
+ manifest: "AndroidManifest-r12.xml",
+ min_sdk_version: "30",
}
android_app {
name: "sdkextensions_e2e_test_app_req_r45",
sdk_version: "current",
- manifest: "AndroidManifest-r45.xml"
+ manifest: "AndroidManifest-r45.xml",
+ min_sdk_version: "30",
}