From 9cecf8422a63fad5958e11f6ecfbdb498baa7468 Mon Sep 17 00:00:00 2001
From: Kazuhiro Inaba <kinaba@google.com>
Date: Thu, 30 Jul 2020 15:48:26 +0900
Subject: [PATCH] cts: Skip CtsInitTestCases over a native bridge.

The set of linked binaries was making it difficult to run
the test over a native bridge. Since init won't usually
run over a native bridge, the test can be skipped.

Bug: 161081809, 142324733, 162288553
Test: Arm build of CtsInitTestCases skips rammus-arc-r Chromebook.
Change-Id: Icdd8b03111d0f3fd6658ee6d9a97fca27181db45
---
 init/AndroidTest.xml | 3 +++
 1 file changed, 3 insertions(+)

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>