Remove common-config and switch to AndroidJUnitTest.
bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38
diff --git a/hostsidetests/os/AndroidTest.xml b/hostsidetests/os/AndroidTest.xml
index 2c991cb..ed149a9 100644
--- a/hostsidetests/os/AndroidTest.xml
+++ b/hostsidetests/os/AndroidTest.xml
@@ -13,9 +13,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for the CTS os host tests">
- <include name="common-config" />
- <option name="apk-installer:test-file-name" value="CtsDeviceOsTestApp.apk" />
+<configuration description="Config for the CTS OS host test cases">
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="CtsDeviceOsTestApp.apk" />
+ </target_preparer>
<test class="com.android.tradefed.testtype.HostTest">
<option name="class" value="android.os.cts.OsHostTests" />
</test>