diff options
Diffstat (limited to 'test/art-gtests-target-standalone-template.xml')
| -rw-r--r-- | test/art-gtests-target-standalone-template.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/art-gtests-target-standalone-template.xml b/test/art-gtests-target-standalone-template.xml index 4b2bdc14c2..015b60ea9d 100644 --- a/test/art-gtests-target-standalone-template.xml +++ b/test/art-gtests-target-standalone-template.xml @@ -17,12 +17,12 @@ <configuration description="Runs {MODULE}."> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="cleanup" value="true" /> - <option name="push" value="{MODULE}->/data/local/tmp/nativetest/{MODULE}" /> + <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}/{MODULE}" /> <option name="append-bitness" value="true" /> </target_preparer> <test class="com.android.tradefed.testtype.GTest" > - <option name="native-test-device-path" value="/data/local/tmp/nativetest" /> + <option name="native-test-device-path" value="/data/local/tmp/{MODULE}" /> <option name="module-name" value="{MODULE}" /> <option name="ld-library-path-32" value="/apex/com.android.art/lib" /> <option name="ld-library-path-64" value="/apex/com.android.art/lib64" /> @@ -36,4 +36,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> |