From 421e8f63a364960b7164ddd4f5ecc99779f6839e Mon Sep 17 00:00:00 2001
From: jdesprez <jdesprez@google.com>
Date: Thu, 29 Mar 2018 15:45:17 -0700
Subject: Update AndroidTest.xml to be APCT suite ready

Test: atest FrameworksServicesTests
Bug: 74440293
Bug: 77290273
Change-Id: I9f20e9979b17985c8cd7cdcefd73f677b8e5ecc1
---
 services/tests/servicestests/AndroidTest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index 082827c23b53..0ec16b523a1b 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Runs Frameworks Services 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="FrameworksServicesTests.apk" />
         <option name="test-file-name" value="JobTestApp.apk" />
@@ -22,7 +24,6 @@
         <option name="test-file-name" value="SuspendTestApp.apk" />
     </target_preparer>
 
-    <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="FrameworksServicesTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.frameworks.servicestests" />
-- 
cgit v1.2.3-59-g8ed1b