commit 392bf493671a77dc8e1197bba982d8a329420fcd
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 18 15:34:27 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 18 15:52:38 2021 +0000
tree b6bf012cb1e76aefcd84c1dff6c031d4b5738093
parent 4756272680131cd856c6ee1eb0fd2deec72ab25d
parent 7ad05b4fd5e428a1898789b6335c492a9b20397a

Make change and version bump to s_aml_310733000 for mainline module file: build/apex/manifest-art.json

Change-Id: I65cfcb2cb4e0a0061b1b71d0b71f041d78896f22

build/apex/manifest-art.json

diff --git a/build/apex/manifest-art.json b/build/apex/manifest-art.json
index 99a85a1..dc20503 100644
--- a/build/apex/manifest-art.json
+++ b/build/apex/manifest-art.json
@@ -1,6 +1,6 @@
 {
   "name": "com.android.art",
-  "version": 310732000,
+  "version": 310733000,
   "provideNativeLibs": [
     "libjdwp.so"
   ],

test/art-run-test-target-template.xml

diff --git a/test/art-run-test-target-template.xml b/test/art-run-test-target-template.xml
index 4084afa..433654a 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>