summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuhiro Inaba <kinaba@google.com>2020-08-05 19:57:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-05 19:57:58 +0000
commit3a7a8b871aae47ead363e6493a01d2e26bc2a2f3 (patch)
treec00ae21679287bf530565cf7360ff014c205e7d9
parentb6b96398f4326f94af42af6b2de8726742b88520 (diff)
parentdf2e518ccf639daf045d99a2a76927a1d7046afd (diff)
downloadcore-3a7a8b871aae47ead363e6493a01d2e26bc2a2f3.tar.gz
cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311 Change-Id: I60ebd26191d4d2e431a113c82b3243419c7aa507
-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>