Add `Sdk31ModuleController` support to remaining ART tests.
This in order to run these tests only if the device under test is
SDK version 31 (Android 12) or above.
Test: atest art_standalone_artd_tests
Test: atest ArtdIntegrationTests (1 test already failing on AOSP)
Test: atest art_standalone_libartpalette_tests
Test: atest odsign_e2e_tests (3 tests already failing on AOSP)
Test: atest art-apex-update-rollback
Change-Id: I41f1dccc9e71a739ac3b7ca5c84d45710fbd6c4e
diff --git a/artd/art_artd_tests.xml b/artd/art_artd_tests.xml
index 9129d98..f9909a0 100644
--- a/artd/art_artd_tests.xml
+++ b/artd/art_artd_tests.xml
@@ -41,4 +41,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>
diff --git a/artd/tests/AndroidTest.xml b/artd/tests/AndroidTest.xml
index 1b30b19..349ef32 100644
--- a/artd/tests/AndroidTest.xml
+++ b/artd/tests/AndroidTest.xml
@@ -26,4 +26,7 @@
<option name="package" value="com.android.art.artdtest"/>
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
</test>
+
+ <!--- 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>
diff --git a/test/art-gtests-target-standalone-cts-template.xml b/test/art-gtests-target-standalone-cts-template.xml
index 6f1e5e7..950e872 100644
--- a/test/art-gtests-target-standalone-cts-template.xml
+++ b/test/art-gtests-target-standalone-cts-template.xml
@@ -42,4 +42,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>
diff --git a/test/odsign/odsign-e2e-tests.xml b/test/odsign/odsign-e2e-tests.xml
index 2ed7b09..84271fa 100644
--- a/test/odsign/odsign-e2e-tests.xml
+++ b/test/odsign/odsign-e2e-tests.xml
@@ -21,4 +21,7 @@
<test class="com.android.tradefed.testtype.HostTest" >
<option name="jar" value="odsign_e2e_tests.jar" />
</test>
+
+ <!--- 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>
diff --git a/test/update-rollback/AndroidTest.xml b/test/update-rollback/AndroidTest.xml
index d389cc2..70df6d9 100644
--- a/test/update-rollback/AndroidTest.xml
+++ b/test/update-rollback/AndroidTest.xml
@@ -21,4 +21,7 @@
<test class="com.android.tradefed.testtype.HostTest" >
<option name="jar" value="art-apex-update-rollback.jar" />
</test>
+
+ <!--- 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>