Add SuiteApkInstaller to CTS test
Bug: 385335049
Change-Id: Id6763aad27ea1cc803b32e408158d9b6d511e3aa
Test: m
Flag: EXEMPT test only change
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9600834..73fd8d8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,6 +5,9 @@
},
{
"name": "AconfigPackageTests"
+ },
+ {
+ "name": "AconfigPublicApiCtsTests"
}
]
}
\ No newline at end of file
diff --git a/framework/tests/Android.bp b/framework/tests/Android.bp
index 1215edc..0676bb2 100644
--- a/framework/tests/Android.bp
+++ b/framework/tests/Android.bp
@@ -39,6 +39,7 @@
],
jarjar_rules: ":framework-configinfrastructure-jarjar",
team: "trendy_team_android_core_experiments",
+ test_config: "AndroidCtsTest.xml",
}
android_test {
diff --git a/framework/tests/AndroidTest.xml b/framework/tests/AndroidCtsTest.xml
similarity index 86%
rename from framework/tests/AndroidTest.xml
rename to framework/tests/AndroidCtsTest.xml
index b048cff..06d97df 100644
--- a/framework/tests/AndroidTest.xml
+++ b/framework/tests/AndroidCtsTest.xml
@@ -22,6 +22,11 @@
<option name="config-descriptor:metadata" key="parameter" value="secondary_user_on_secondary_display" />
<option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.configinfrastructure.apex" />
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="AconfigPublicApiCtsTests.apk" />
+ </target_preparer>
+
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.os.flagging.test" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
