Add our integration tests to cts
Note: per_testcase_directory: true is added to the two tests sharing
MicrodroidTestApp as a support file. This is needed to avoid having
duplicated install rules for the app file. Without that, we hit
build/make/core/main.mk:1430: error: overriding commands for target
`out/host/linux-x86/cts/android-cts/testcases/MicrodroidTestApp.apk',
previously defined at build/make/core/main.mk:1430
Bug: 204979196
Test: check android-cts-tests_list.zip in the test_suites_[arm64|x86_64]
targets to see if the added tests are here.
Change-Id: Idcea518db04407da993d866b114f17f90be20209
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 7dca024..5c5e608 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -4,7 +4,10 @@
android_test {
name: "MicrodroidTestApp",
- test_suites: ["general-tests"],
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
srcs: ["src/java/**/*.java"],
static_libs: [
"androidx.test.runner",
@@ -16,6 +19,8 @@
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