summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuhiro Inaba <kinaba@google.com>2020-08-05 19:10:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-05 19:10:41 +0000
commit49ddb673c5220dd57c190602c0c3b6d3a36ebdee (patch)
tree107c6a4b0a828d6d509a0ffdced63dd88d88c72a
parentce44c8ac3caebe5b5a34954643bf48be186bc783 (diff)
parent9cecf8422a63fad5958e11f6ecfbdb498baa7468 (diff)
downloadcore-49ddb673c5220dd57c190602c0c3b6d3a36ebdee.tar.gz
cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311 Change-Id: I9d208b96945f99b64da031d03e09a570862bcc1b
-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>