diff options
| author | 2021-06-07 23:36:52 +0000 | |
|---|---|---|
| committer | 2021-06-07 23:36:52 +0000 | |
| commit | feb4aed5a87e0c00bf18f5af278f36d66cab8118 (patch) | |
| tree | 29b94ab6598ec728e42108269ef2cc3b5d35cced | |
| parent | 68b5756f90c392cf11ab2846d23473819520aa0f (diff) | |
| parent | 6ec6b189601229436375c986296a93e75b4f662e (diff) | |
Merge "Fix OverlayConfigTest minSdkVersion" into sc-dev
| -rw-r--r-- | core/tests/coretests/apks/overlay_config/Android.bp | 1 | ||||
| -rw-r--r-- | core/tests/coretests/apks/overlay_config/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/tests/coretests/apks/overlay_config/Android.bp b/core/tests/coretests/apks/overlay_config/Android.bp index 9c971fd2f1bc..07775239d6ed 100644 --- a/core/tests/coretests/apks/overlay_config/Android.bp +++ b/core/tests/coretests/apks/overlay_config/Android.bp @@ -10,4 +10,5 @@ package { android_test_helper_app { name: "FrameworksCoreTests_overlay_config", defaults: ["FrameworksCoreTests_apks_defaults"], + min_sdk_version: "20", } diff --git a/core/tests/coretests/apks/overlay_config/AndroidManifest.xml b/core/tests/coretests/apks/overlay_config/AndroidManifest.xml index b15338eb545b..092a5754286f 100644 --- a/core/tests/coretests/apks/overlay_config/AndroidManifest.xml +++ b/core/tests/coretests/apks/overlay_config/AndroidManifest.xml @@ -19,7 +19,7 @@ <application android:hasCode="false" /> - <uses-sdk android:targetSdkVersion="21"/> + <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="21"/> <overlay android:targetPackage="android" android:targetName="TestResources" /> |