commit 51edfcf62b771765d3c716b082e8e39f77245f1b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 22 17:42:50 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 22 17:42:50 2018 +0000
tree 6cf5f290bfbf232e880c0b380d7f65e2048bcba6
parent 684e9336090cc17f97ecc25894e8c670b1dd09ec
parent 0152ad2b45d1e47be5dfd0ae79ace30c066e4022

Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index a55aeed..cbca5a7 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Runs Telecom Test Cases.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <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="TelecomUnitTests.apk" />
     </target_preparer>
 
-    <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="TelecomUnitTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.server.telecom.tests" />