commit 3bd78ec87e17b88b60546044bee9fef17cc8ecee
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 20 01:57:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 20 01:57:30 2018 +0000
tree dfca41ac186e124556ac4024ab9def22e3db0d8e
parent 40bfe1e91084fefd3eb08de428dfd8e53ddd4995
parent d69d64607ab444a803c713c7192b64d4fd33d37c

Merge "Update the base autogenerated config template for instru" into pi-dev

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>