Remove EncryptionRunner's instrumentation target.
am: 667c2e10e2
Change-Id: Ia64a251c0fa25c0b1aab8c7cf76a880b208d2b2a
diff --git a/EncryptionRunner/AndroidManifest.xml b/EncryptionRunner/AndroidManifest.xml
index 8d7643e..9b76d15 100644
--- a/EncryptionRunner/AndroidManifest.xml
+++ b/EncryptionRunner/AndroidManifest.xml
@@ -18,11 +18,5 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
package="android.car.encryptionrunner" >
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />
- <application>
- <uses-library android:name="android.test.runner" />
- </application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.car.encryptionrunner"
- android:label="Encryption Runner Tests" />
+ <application />
</manifest>
diff --git a/EncryptionRunner/AndroidTest.xml b/EncryptionRunner/AndroidTest.xml
deleted file mode 100644
index b6cbbfa..0000000
--- a/EncryptionRunner/AndroidTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Runs Tests for EncryptionRunner.">
- <option name="test-tag" value="EncryptionRunnerTest" />
-
- <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="cleanup-apks" value="true" />
- <option name="test-file-name" value="EncryptionRunnerTest.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
- <option name="package" value="android.car.encryptionrunner" />
- <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
- <option name="hidden-api-checks" value="false"/>
- </test>
-</configuration>