diff options
| author | Eric Arseneau <earseneau@google.com> | 2021-12-06 14:36:11 -0800 |
|---|---|---|
| committer | Eric Arseneau <earseneau@google.com> | 2021-12-06 14:36:11 -0800 |
| commit | 6ad2c0ba3b84dffc86def566a9d6688d5a25e2d4 (patch) | |
| tree | a97bd8cd66795221da6d0ce1da8b89d834f94fc6 /runtime | |
| parent | 28ae49ccaff18c2da1e2d3c9597707a19b54bf08 (diff) | |
| parent | 5c93b633c1ed96c729a2b07eb7bf2719bd2ada32 (diff) | |
Merge mpr-2021-11-05
Change-Id: Icd1f32d5d274239e323872ccd98a69f5b83add9b
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/art_standalone_runtime_compiler_tests.xml | 3 | ||||
| -rw-r--r-- | runtime/art_standalone_runtime_tests.xml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/runtime/art_standalone_runtime_compiler_tests.xml b/runtime/art_standalone_runtime_compiler_tests.xml index 0f6bb4bf23..3b21e578d0 100644 --- a/runtime/art_standalone_runtime_compiler_tests.xml +++ b/runtime/art_standalone_runtime_compiler_tests.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/runtime/art_standalone_runtime_tests.xml b/runtime/art_standalone_runtime_tests.xml index 1267213f20..1bb80fdafe 100644 --- a/runtime/art_standalone_runtime_tests.xml +++ b/runtime/art_standalone_runtime_tests.xml @@ -108,4 +108,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> |