Remove common-config and switch to AndroidJUnitTest.
bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38
diff --git a/tests/filesystem/AndroidTest.xml b/tests/filesystem/AndroidTest.xml
index 65d4296..8b961fe 100644
--- a/tests/filesystem/AndroidTest.xml
+++ b/tests/filesystem/AndroidTest.xml
@@ -13,11 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for CTS File System Test Cases">
- <include name="common-config" />
- <option name="apk-installer:test-file-name" value="CtsFileSystemTestCases.apk" />
- <test class="com.android.tradefed.testtype.InstrumentationTest" >
+<configuration description="Config for CTS File System test cases">
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="CtsFileSystemTestCases.apk" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.filesystem.cts" />
- <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
</test>
</configuration>
\ No newline at end of file