From ea6764eb5ebb44053f54f9769bf15b1ebd3d1ca9 Mon Sep 17 00:00:00 2001
From: jdesprez <jdesprez@google.com>
Date: Tue, 13 Mar 2018 12:39:51 -0700
Subject: [PATCH] Update AndroidTest to work with apct-suite setup

Updating the AndroidTest.xml to be picked up by the new
APCT suite setup.

Test: atest FrameworksCoreTests
Bug: 74440293
Change-Id: Ib1ca44ba29dc349ca372effc1586e1d3376bd549
---
 core/tests/coretests/AndroidTest.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/tests/coretests/AndroidTest.xml b/core/tests/coretests/AndroidTest.xml
index 970a0f00bf5ef..7b5ad9a42d007 100644
--- a/core/tests/coretests/AndroidTest.xml
+++ b/core/tests/coretests/AndroidTest.xml
@@ -14,15 +14,16 @@
      limitations under the License.
 -->
 <configuration description="Runs Frameworks Core Tests.">
-    <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="FrameworksCoreTests.apk" />
         <option name="test-file-name" value="BstatsTestApp.apk" />
     </target_preparer>
-
-    <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="FrameworksCoreTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.frameworks.coretests" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
 </configuration>