diff options
author | Roland Levillain <rpl@google.com> | 2021-08-18 11:17:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-18 11:17:07 +0000 |
commit | e24293b3f4faa7835bbf60213e49c9ae085edaa0 (patch) | |
tree | 865b4515c06477665fd9774e01afd30c69e8a453 | |
parent | d83578382be43594bc4d137d476ac16f7a7cf21e (diff) | |
parent | 7ad05b4fd5e428a1898789b6335c492a9b20397a (diff) |
Add `Sdk31ModuleController` support to more ART run-tests. am: 7ad05b4fd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15596341
Change-Id: I1756f915f88ff4d7995c37666f48b731a380c013
-rw-r--r-- | test/art-run-test-target-template.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/art-run-test-target-template.xml b/test/art-run-test-target-template.xml index 4084afa6c3..433654a9a0 100644 --- a/test/art-run-test-target-template.xml +++ b/test/art-run-test-target-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> |