diff options
| author | Anvesh Renikindi <renikindi@google.com> | 2023-12-06 21:01:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-06 21:01:48 +0000 |
| commit | 138f9853eaf58c6d2029472222ddee1d98f93e22 (patch) | |
| tree | 00bddcc277e425fc92fc259748bb9fd16405ba97 | |
| parent | f84c8e66390b66a5709fc44244398529b2266d26 (diff) | |
| parent | 324ca39cc9fdfea2703230664d4ae97eac65459a (diff) | |
| download | base-138f9853eaf58c6d2029472222ddee1d98f93e22.tar.gz | |
Merge "Update to minSdkVersion 19 for tests." into aosp-main-future
6 files changed, 10 insertions, 10 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp index d0645b0d8b12..23a2a7fbf0e5 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp @@ -28,7 +28,7 @@ android_test_helper_app { srcs: ["src/**/*.java"], - sdk_version: "16", + sdk_version: "19", javacflags: ["-nowarn"], @@ -43,5 +43,5 @@ android_test_helper_app { enabled: false, }, - min_sdk_version: "16", + min_sdk_version: "19", } diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp index c0c8aba2d2f0..4ddaeef0e4a2 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp @@ -40,7 +40,7 @@ android_test_helper_app { enabled: false, }, - min_sdk_version: "16", + min_sdk_version: "19", } android_test_helper_app { @@ -66,5 +66,5 @@ android_test_helper_app { enabled: false, }, - min_sdk_version: "16", + min_sdk_version: "19", } diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp index fe294168586d..afb111d7e2d4 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp @@ -28,7 +28,7 @@ android_test { javacflags: ["-nowarn"], - min_sdk_version: "16", + min_sdk_version: "19", instrumentation_for: "MultiDexLegacyTestApp", } diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp index c558153c6a4e..8c57df6707f2 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp @@ -31,7 +31,7 @@ android_test { javacflags: ["-nowarn"], - min_sdk_version: "16", + min_sdk_version: "19", instrumentation_for: "MultiDexLegacyTestApp", } @@ -51,7 +51,7 @@ android_test { javacflags: ["-nowarn"], - min_sdk_version: "16", + min_sdk_version: "19", instrumentation_for: "MultiDexLegacyTestApp", } diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml index 9a4c3c5d6e81..840daabc2ba9 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml @@ -5,8 +5,8 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="18"/> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19"/> <application android:name="androidx.multidex.MultiDexApplication" android:allowBackup="true" diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp index 75c753cef0fd..2244a830e254 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp @@ -24,5 +24,5 @@ android_test { libs: ["android-support-multidex"], static_libs: ["androidx.test.rules"], - sdk_version: "16", + sdk_version: "19", } |