Use adb APK installer in launch tests
Test: presubmit
Change-Id: I924efbc07b40bbee0d2aac390cccfb4fcbea7c0e
diff --git a/test_targets/csuite-app-launch/default.xml b/test_targets/csuite-app-launch/default.xml
index d012df9..e583002 100644
--- a/test_targets/csuite-app-launch/default.xml
+++ b/test_targets/csuite-app-launch/default.xml
@@ -14,10 +14,6 @@
limitations under the License.
-->
<configuration description="Launches an app and check for crashes">
- <option name="package-name" value="{package}"/>
- <target_preparer class="com.android.compatibility.targetprep.AppSetupPreparer">
- <option name="test-file-name" value="app://{package}"/>
- </target_preparer>
<target_preparer class="com.android.compatibility.targetprep.CheckGmsPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="input keyevent KEYCODE_WAKEUP"/>
@@ -26,6 +22,7 @@
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
<option name="set-option" value="package-name:{package}"/>
+ <option name="set-option" value="install-apk:app\://{package}"/>
<option name="class" value="com.android.csuite.tests.AppLaunchTest" />
</test>
</configuration>
\ No newline at end of file
diff --git a/test_targets/csuite-test-package-launch/template.xml b/test_targets/csuite-test-package-launch/template.xml
index f77ddc3..34ba321 100644
--- a/test_targets/csuite-test-package-launch/template.xml
+++ b/test_targets/csuite-test-package-launch/template.xml
@@ -14,11 +14,6 @@
limitations under the License.
-->
<configuration description="Installs a test package with -t arg and check for launch crashes">
- <option name="package-name" value="{package}"/>
- <target_preparer class="com.android.compatibility.targetprep.AppSetupPreparer">
- <option name="test-file-name" value="app://{package}"/>
- <option name="install-arg" value="-t"/>
- </target_preparer>
<target_preparer class="com.android.compatibility.targetprep.CheckGmsPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="input keyevent KEYCODE_WAKEUP"/>
@@ -27,6 +22,8 @@
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
<option name="set-option" value="package-name:{package}"/>
+ <option name="set-option" value="install-apk:app\://{package}"/>
+ <option name="set-option" value="install-arg:-t"/>
<option name="class" value="com.android.csuite.tests.AppLaunchTest" />
</test>
</configuration>
\ No newline at end of file
diff --git a/test_targets/drm-app-launch/template.xml b/test_targets/drm-app-launch/template.xml
index e723cac..f7abcdd 100644
--- a/test_targets/drm-app-launch/template.xml
+++ b/test_targets/drm-app-launch/template.xml
@@ -14,11 +14,6 @@
limitations under the License.
-->
<configuration description="DRM launch test configuration">
- <option name="package-name" value="{package}"/>
- <target_preparer class="com.android.compatibility.targetprep.AppSetupPreparer">
- <option name="test-file-name" value="{package_install_file}"/>
- <option name="install-arg" value="-t"/>
- </target_preparer>
<target_preparer class="com.android.compatibility.targetprep.CheckGmsPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="input keyevent KEYCODE_WAKEUP"/>
@@ -27,6 +22,8 @@
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
<option name="set-option" value="package-name:{package}"/>
+ <option name="set-option" value="install-apk:{package_install_file}"/>
+ <option name="set-option" value="install-arg:-t"/>
<option name="class" value="com.android.csuite.tests.AppLaunchTest" />
</test>
</configuration>
\ No newline at end of file
