commit 6415652f99cc16127003b6992406bec21de8b1de
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 03 23:09:45 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 03 23:09:45 2021 +0000
tree ba2c43c68da4bcb5a86ce9361b3fe134dc268db1
parent 9c3e5ad0564f7eae98a33edb8441a1e40694e1c4
parent ff06a4817f09d9e2429788254bce760fb545a7ff

Snap for 7880955 from ff06a4817f09d9e2429788254bce760fb545a7ff to sc-v2-release

Change-Id: I7751d1357d052a31afbfb073b96cc371d673833b

tests/native/AndroidTest.xml

diff --git a/tests/native/AndroidTest.xml b/tests/native/AndroidTest.xml
index fa189d5..be00cda 100644
--- a/tests/native/AndroidTest.xml
+++ b/tests/native/AndroidTest.xml
@@ -26,4 +26,7 @@
         <option name="module-name" value="CtsApexSharedLibrariesTestCases" />
         <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>