Revert "Add our integration tests to cts"
This reverts commit a7351654f40cd0f6caccf1780d55d1fe2632af11.
Reason for revert: Failing google_required_freeze/test-mapping-presubmit/vendor_img_cf_x86_rvc b/218303240
Test: N/A
Change-Id: I5691376a3e8cb8d7455222f73f965a7bca01b707
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 0699e3d..a8b068c 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -4,10 +4,7 @@
android_test {
name: "MicrodroidTestApp",
- test_suites: [
- "cts",
- "general-tests",
- ],
+ test_suites: ["general-tests"],
srcs: ["src/java/**/*.java"],
static_libs: [
"androidx.test.runner",
@@ -19,8 +16,6 @@
jni_libs: ["MicrodroidTestNativeLib"],
platform_apis: true,
use_embedded_native_libs: true,
- // We only support 64-bit ABI, but CTS demands all APKs to be multi-ABI.
- compile_multilib: "both",
}
// TODO(jiyong): make this a binary, not a shared library
diff --git a/tests/testapk/AndroidTest.xml b/tests/testapk/AndroidTest.xml
index e8bb1aa..c7097db 100644
--- a/tests/testapk/AndroidTest.xml
+++ b/tests/testapk/AndroidTest.xml
@@ -14,12 +14,7 @@
limitations under the License.
-->
<configuration description="Runs sample instrumentation test.">
- <option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="security" />
- <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
- <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
- <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="test-file-name" value="MicrodroidTestApp.apk" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">