| commit | 8a024caa61ed61000d816665277a05c2e0982cb8 | [log] [tgz] |
|---|---|---|
| author | Max Bires <jbires@google.com> | Tue Jul 18 16:28:54 2023 -0700 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Jul 19 15:32:37 2023 +0000 |
| tree | 4cf77133db3a6da2eba444be6616d90b1a3df113 | |
| parent | 360acf5050ddafd3a62904ce4550c16ad45cb920 [diff] |
Add missing module_controller filter to host tests Without a module_filter, these tests will attempt to run on devices that should not have the rkpd mainline module (e.g. pre Android 14 devices). Test: these tests don't run on earlier targets Bug: 289986564 (cherry picked from https://android-review.googlesource.com/q/commit:146b36657bb0995d8a08671fbc67529ca6d13656) Merged-In: Ifde0720083e78ef49d68c1653b74d75e92c22f47 Change-Id: Ifde0720083e78ef49d68c1653b74d75e92c22f47
diff --git a/app/tests/hosttest/AndroidTest.xml b/app/tests/hosttest/AndroidTest.xml index 5e79b2e..10c71c2 100644 --- a/app/tests/hosttest/AndroidTest.xml +++ b/app/tests/hosttest/AndroidTest.xml
@@ -26,4 +26,11 @@ <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" > <option name="jar" value="RkpdAppHostTests.jar" /> </test> + + <!-- Only run if RKPD mainline module is installed --> + <object type="module_controller" + class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> + <option name="enable" value="true" /> + <option name="mainline-module-package-name" value="com.android.rkpd" /> + </object> </configuration>