Add `Sdk31ModuleController` support to more ART gtests run as root.
This in order to run these tests only if the device under test is
SDK version 31 (Android 12) or above.
(cherry picked from commit 53fa3e3e0e2c313ead760d5571c9516d7fb7a5a7)
Test: m mts && mts-tradefed run commandAndExit mts-art
Bug: 201491591
Bug: 184696655
Bug: 181724969
Change-Id: I98b3cfd94c17af5ce79e8e8e993f03c526947a61
Merged-In: I98b3cfd94c17af5ce79e8e8e993f03c526947a61
diff --git a/test/art-gtests-target-standalone-root-template.xml b/test/art-gtests-target-standalone-root-template.xml
index a8ed9dc..c527749 100644
--- a/test/art-gtests-target-standalone-root-template.xml
+++ b/test/art-gtests-target-standalone-root-template.xml
@@ -38,4 +38,7 @@
<!-- ART Mainline Module (external (AOSP) version). -->
<option name="mainline-module-package-name" value="com.android.art" />
</object>
+
+ <!--- Only run tests if the device under test is SDK version 31 (Android 12) or above. -->
+ <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk31ModuleController" />
</configuration>