commit d69d64607ab444a803c713c7192b64d4fd33d37c
author jdesprez <jdesprez@google.com> Tue Mar 13 12:44:04 2018 -0700
committer Julien Desprez <jdesprez@google.com> Fri Mar 16 18:16:34 2018 +0000
tree 5e75c177a8dc1d61a61ea15102c75983ca940761
parent 1a50e975aef4875a26db8037d9c13a0a2ee6a2c4

Update the base autogenerated config template for instru

For APCT auto-generated configuration, the template will
include the test-suite-tag that will allow it to be
picked up by the current ATP gcl config.

Test: none
Bug: 74440293
Change-Id: I66e9f2f75e43a9371cf8b55130cd49a962753167
Merged-In: Ia82e8287f212f4daec97523394517bfbbe7a86d3

core/instrumentation_test_config_template.xml

diff --git a/core/instrumentation_test_config_template.xml b/core/instrumentation_test_config_template.xml
index a0badab..18ea676 100644
--- a/core/instrumentation_test_config_template.xml
+++ b/core/instrumentation_test_config_template.xml
@@ -15,7 +15,10 @@
 -->
 <!-- This test config file is auto-generated. -->
 <configuration description="Runs {LABEL}.">
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="apct-instrumentation" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="{MODULE}.apk" />
     </target_preparer>