Update configurations to avoid using ApkInstaller
- use the new tradefed version of it.
- add a tests to check configs.
Test: build, run collect-tests-only dry-run
Bug: 37213493
Change-Id: I45e9950aa2731afe9403dd44dd18d0a8d40fdb6b
Merged-In: Ia212b707befe3ffc70ef43cbc292e97be3f364f1
diff --git a/tests/libcore/jsr166/AndroidTest.xml b/tests/libcore/jsr166/AndroidTest.xml
index bdf5643..1a4f1da 100644
--- a/tests/libcore/jsr166/AndroidTest.xml
+++ b/tests/libcore/jsr166/AndroidTest.xml
@@ -19,7 +19,7 @@
<option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/user.home" />
<option name="teardown-command" value="rm -rf /data/local/tmp/ctslibcore" />
</target_preparer>
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<!-- this has just the instrumentation which acts as the tests we want to run -->
<option name="test-file-name" value="CtsLibcoreJsr166TestCases.apk" />