summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-04-05 17:37:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-05 17:37:14 +0000
commit3112ff5148e72bdbd67eb31a55763945fd5e9823 (patch)
tree6448fac2b99b4dac8362a7ed55184b00279f590b
parent872ceaecafe985a92641b4e5be80109527660cdc (diff)
parent0f9fd819374e170e14b8ec0c2fa20a56eba5ab3f (diff)
downloadcts-3112ff5148e72bdbd67eb31a55763945fd5e9823.tar.gz
Merge "DO NOT MERGE: Fix SDK versions for CtsDomainVerificationDeviceStandaloneTestCases" into sc-v2-dev
-rw-r--r--hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp2
-rw-r--r--hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp b/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
index 94d712f811b..80caeb5e6f3 100644
--- a/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
@@ -36,6 +36,7 @@ android_test_helper_app {
"cts_defaults",
"CtsDomainVerificationTestDeclaringAppDefaults",
],
+ min_sdk_version: "31",
sdk_version: "test_current",
aaptflags: ["--rename-manifest-package com.android.cts.packagemanager.verify.domain.declaringapp1"],
}
@@ -47,6 +48,7 @@ android_test_helper_app {
"cts_defaults",
"CtsDomainVerificationTestDeclaringAppDefaults",
],
+ min_sdk_version: "31",
sdk_version: "test_current",
aaptflags: ["--rename-manifest-package com.android.cts.packagemanager.verify.domain.declaringapp2"],
}
diff --git a/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml b/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml
index 17cfa19c41b..e7afa10cb7a 100644
--- a/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml
+++ b/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml
@@ -24,6 +24,7 @@
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
+ <option name="check-min-sdk" value="true" />
<option name="test-file-name" value="CtsDomainVerificationDeviceStandaloneTestCases.apk" />
<option name="test-file-name" value="CtsDomainVerificationTestDeclaringApp1.apk" />
<option name="test-file-name" value="CtsDomainVerificationTestDeclaringApp2.apk" />