commit 70bf068c9fb31a5e215701cabe1226451521639d
author Jiyong Park <jiyong@google.com> Mon Feb 07 15:16:12 2022 +0000
committer Jiyong Park <jiyong@google.com> Tue Feb 08 00:18:00 2022 +0900
tree 007db49ce57eb0a5215997929c5d57cb3ca46aed
parent 926806da784401e467ded913252ec14322c3a13a

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

tests/testapk/Android.bp

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