summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuhiro Inaba <kinaba@google.com>2020-08-05 19:38:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-05 19:38:53 +0000
commitea29139592c12456044e2cc63f0d8737e1310801 (patch)
tree96efddbe63f457b9ca4ab45424f5f7b38bcf8051
parent3418e7c4dfde6e4d9f3a897f4747bb7238730914 (diff)
parent49ddb673c5220dd57c190602c0c3b6d3a36ebdee (diff)
downloadcore-ea29139592c12456044e2cc63f0d8737e1310801.tar.gz
cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311 Change-Id: I97cd1bbf989bfbf58277376cfd25216a0fc71d71
-rw-r--r--init/AndroidTest.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/init/AndroidTest.xml b/init/AndroidTest.xml
index 920dc6c58..95f97e3fd 100644
--- a/init/AndroidTest.xml
+++ b/init/AndroidTest.xml
@@ -29,4 +29,7 @@
<option name="module-name" value="CtsInitTestCases" />
<option name="runtime-hint" value="65s" />
</test>
+ <!-- Controller that will skip the module if a native bridge situation is detected -->
+ <!-- For example: module wants to run arm32 and device is x86 -->
+ <object type="module_controller" class="com.android.tradefed.testtype.suite.module.NativeBridgeModuleController" />
</configuration>