commit 01a773f4b3945eb7625f3d2d4584cb7ebf6ef172
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Mar 19 12:02:20 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 12:02:20 2024 +0000
tree fbf8e0a269379ecb72da6fcaacb8082c39458546
parent e7a90cc0d8ee5fde325a74949df6fcec01f0b547
parent f84dd22897bbeb187ac7dce21b0132f5049b16ed

Merge "Disable AvfRkpdVmAttestationTestApp when rkpd is disabled" into main

service_vm/test_apk/AndroidTest.rkpd.xml

diff --git a/service_vm/test_apk/AndroidTest.rkpd.xml b/service_vm/test_apk/AndroidTest.rkpd.xml
index 2c0380c..39eca32 100644
--- a/service_vm/test_apk/AndroidTest.rkpd.xml
+++ b/service_vm/test_apk/AndroidTest.rkpd.xml
@@ -28,4 +28,11 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.virt.rkpd.vm_attestation.testapp" />
     </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>