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/Android.bp b/tests/Android.bp
index cf720f1..58cc06f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -22,8 +22,13 @@
kernel_modules_stem = "virt_device_prebuilts_kernel_modules-" + kernel_version
cc_test {
- name: "VirtualizationTestCases",
- test_suites: ["general-tests"],
+ // ".64" suffix is to work around cts-unit-test which is demanding that all
+ // executables in CTS should have both 32 and 64 ABIs.
+ name: "VirtualizationTestCases.64",
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
srcs: [
"common.cc",
"vsock_test.cc",