Add metadata to modules in test/vts-testcase/fuzz am: 6527407c31 am: 8c5d8a616b am: 113d2ae57a -s ours Change-Id: I60876fccdcdd01175cc869d40228c6647175aaff

commit: eef8f21bd7edbb344123ac636f6886513c4318cd [log] [tgz]
author: Hsin-Yi Chen <hsinyichen@google.com> Wed Jan 17 07:11:03 2018 +0000
committer: android-build-merger <android-build-merger@google.com> Wed Jan 17 07:11:03 2018 +0000
tree: 53502ad840971e1de2410ddd111c456d4d81a01e
parent: 88261d65364315c76acd8cbb624431eb1d3f0fb7 [diff]
parent: 113d2ae57a4823db052bdf20bb7e92f8d22fffb7 [diff]
diff --git a/config/audio/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/V2_0/func_fuzzer/AndroidTest.xml
index 8d879a8..7d8e800 100644
--- a/config/audio/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>

diff --git a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
index e209388..693a1f1 100644
--- a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>

diff --git a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
index 9eb6e42..dabad99 100644
--- a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioCommonV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>

diff --git a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
index 4c63671..0cd0ad1 100644
--- a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioCommonV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>

diff --git a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
index eea5602..22b50cd 100644
--- a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioEffectV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>

diff --git a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
index f81ca38..d0f8707 100644
--- a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioEffectV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>

diff --git a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
index 4a3bf00..c06b76b 100644
--- a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveEvsV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>

diff --git a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
index f678ea4..595acff 100644
--- a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveEvsV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>

diff --git a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
index 35dd8a5..f7b9b9b 100644
--- a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>

diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
index df4221f..b88e71c 100644
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>

diff --git a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
index 9626e27..54b02e0 100644
--- a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.1"/>

diff --git a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
index 2eff584..2abeb6d 100644
--- a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.1"/>

diff --git a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
index 501372d..452fa4e 100644
--- a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>

diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
index 6e746df..696d021 100644
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>

diff --git a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
index fb63d11..48b156b 100644
--- a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBluetoothV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>

diff --git a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
index 51c5ec1..852cabb 100644
--- a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBluetoothV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>

diff --git a/config/boot/V1_0/func_fuzzer/AndroidTest.xml b/config/boot/V1_0/func_fuzzer/AndroidTest.xml
index cdc2e63..27e132f 100644
--- a/config/boot/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBootV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>

diff --git a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
index b1c6cc4..93662d1 100644
--- a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBootV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>

diff --git a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
index 967e180..8dc530c 100644
--- a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>

diff --git a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
index 4c09288..4470c4b 100644
--- a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>

diff --git a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
index 49f7cdf..8aaa030 100644
--- a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>

diff --git a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
index fb415f8..bdd3632 100644
--- a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>

diff --git a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
index 6b42c9b..6280250 100644
--- a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraCommonV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.common@1.0"/>

diff --git a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
index 04044ae..48ca1b8 100644
--- a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraCommonV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.common@1.0"/>

diff --git a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
index 08f9e2a..70253b4 100644
--- a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>

diff --git a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
index c97b74c..1ed02d2 100644
--- a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>

diff --git a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
index 3f24035..b98a7d2 100644
--- a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV3_2FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>

diff --git a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
index dfc6be4..a5d7657 100644
--- a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV3_2IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>

diff --git a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
index 580d4ea..a72ad8b 100644
--- a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraMetadataV3_2FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>

diff --git a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
index 3e5e197..19ba17e 100644
--- a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraMetadataV3_2IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>

diff --git a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
index 5e6c27c..b44c510 100644
--- a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraProviderV2_4FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>

diff --git a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
index 023f6fe..9da4b50 100644
--- a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraProviderV2_4IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>

diff --git a/config/cas/V1_0/iface_fuzzer/Android.mk b/config/cas/V1_0/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..362e172
--- /dev/null
+++ b/config/cas/V1_0/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalCasV1_0IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..0538003
--- /dev/null
+++ b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalCasV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalCasV1_0IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.cas@1.0"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/cas/native/V1_0/iface_fuzzer/Android.mk b/config/cas/native/V1_0/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..62529ac
--- /dev/null
+++ b/config/cas/native/V1_0/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalCasNativeV1_0IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..b1dc632
--- /dev/null
+++ b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalCasNativeV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalCasNativeV1_0IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.cas.native@1.0"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
index d56fc2c..c2756f3 100644
--- a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalConfigstoreV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>

diff --git a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
index d49bb43..c7c8b28 100644
--- a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalConfigstoreV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>

diff --git a/config/configstore/V1_1/iface_fuzzer/Android.mk b/config/configstore/V1_1/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..194ab3d
--- /dev/null
+++ b/config/configstore/V1_1/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalConfigstoreV1_1IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..b8cecb1
--- /dev/null
+++ b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalConfigstoreV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalConfigstoreV1_1IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.configstore@1.1"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
index dc99a28..ce604af 100644
--- a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalContexthubV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>

diff --git a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
index bd796d5..436490a 100644
--- a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalContexthubV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>

diff --git a/config/drm/V1_0/func_fuzzer/AndroidTest.xml b/config/drm/V1_0/func_fuzzer/AndroidTest.xml
index bd72c06..140587a 100644
--- a/config/drm/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDrmV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>

diff --git a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
index 3dcfbd6..9fa8e07 100644
--- a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDrmV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>

diff --git a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
index 275402c..917f12a 100644
--- a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDumpstateV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>

diff --git a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
index 9448c28..d2e268b 100644
--- a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDumpstateV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>

diff --git a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
index e41b688..5d3f421 100644
--- a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGatekeeperV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>

diff --git a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
index 74ce1ac..1e565fb 100644
--- a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGatekeeperV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>

diff --git a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
index 1c2f0e3..cfee4f6 100644
--- a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGnssV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>

diff --git a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
index f2629e7..f65094a 100644
--- a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGnssV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>

diff --git a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
index 3329172..297b154 100644
--- a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsAllocatorV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>

diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
index 4ee703c..d2f7e5d 100644
--- a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsAllocatorV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>

diff --git a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
index ef43adc..3a30850 100644
--- a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsBufferqueueV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@1.0"/>

diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
index 9ab6b3a..3892223 100644
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsBufferqueueV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@1.0"/>

diff --git a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
index c6880d0..a1a06c7 100644
--- a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsCommonV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>

diff --git a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
index c8105f1..6449d6c 100644
--- a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsCommonV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>

diff --git a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
index 318157f..0348e7b 100644
--- a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsComposerV2_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>

diff --git a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
index bd457c0..678c171 100644
--- a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsComposerV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>

diff --git a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
index 6f70f86..1adab76 100644
--- a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsMapperV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>

diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
index e326bb2..fa443db 100644
--- a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsMapperV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>

diff --git a/config/health/V1_0/func_fuzzer/AndroidTest.xml b/config/health/V1_0/func_fuzzer/AndroidTest.xml
index 9d75039..be4b899 100644
--- a/config/health/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalHealthV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>

diff --git a/config/health/V1_0/iface_fuzzer/AndroidTest.xml b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
index 61a6990..0cef0fd 100644
--- a/config/health/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalHealthV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>

diff --git a/config/ir/V1_0/func_fuzzer/AndroidTest.xml b/config/ir/V1_0/func_fuzzer/AndroidTest.xml
index cb1968d..a57bc90 100644
--- a/config/ir/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalIrV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>

diff --git a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
index 83d0064..7596c05 100644
--- a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalIrV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>

diff --git a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
index 62a8aeb..50c0087 100644
--- a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalKeymasterV3_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>

diff --git a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
index d5354f9..80f681b 100644
--- a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalKeymasterV3_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>

diff --git a/config/light/V2_0/func_fuzzer/AndroidTest.xml b/config/light/V2_0/func_fuzzer/AndroidTest.xml
index a21c125..0fa2689 100644
--- a/config/light/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalLightV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>

diff --git a/config/light/V2_0/iface_fuzzer/AndroidTest.xml b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
index 091c4b5..d25c9f8 100644
--- a/config/light/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalLightV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>

diff --git a/config/media/V1_0/func_fuzzer/AndroidTest.xml b/config/media/V1_0/func_fuzzer/AndroidTest.xml
index b3f10b8..f91ccf9 100644
--- a/config/media/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>

diff --git a/config/media/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
index 4118664..4f045f6 100644
--- a/config/media/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>

diff --git a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
index 93e32f3..fe93f83 100644
--- a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaOmxV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>

diff --git a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
index 1f0591f..3b9df4c 100644
--- a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaOmxV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>

diff --git a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
index a30db1c..a11c679 100644
--- a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMemtrackV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>

diff --git a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
index 80a7803..2c4b6cf 100644
--- a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMemtrackV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>

diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/Android.mk b/config/neuralnetworks/V1_0/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..84e315d
--- /dev/null
+++ b/config/neuralnetworks/V1_0/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalNeuralnetworksV1_0IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..90d61b0
--- /dev/null
+++ b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalNeuralnetworksV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalNeuralnetworksV1_0IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.neuralnetworks@1.0"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
index 112f82f..59fb7b1 100644
--- a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalNfcV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>

diff --git a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
index 939929d..3ac90bc 100644
--- a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalNfcV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>

diff --git a/config/oemlock/V1_0/iface_fuzzer/Android.mk b/config/oemlock/V1_0/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..1439d24
--- /dev/null
+++ b/config/oemlock/V1_0/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalOemlockV1_0IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..0eff014
--- /dev/null
+++ b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalOemlockV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalOemlockV1_0IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.oemlock@1.0"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/power/V1_0/func_fuzzer/AndroidTest.xml b/config/power/V1_0/func_fuzzer/AndroidTest.xml
index 1dc800e..d3529e4 100644
--- a/config/power/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalPowerV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>

diff --git a/config/power/V1_0/iface_fuzzer/AndroidTest.xml b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
index 6be636a..525eb14 100644
--- a/config/power/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalPowerV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>

diff --git a/config/power/V1_1/iface_fuzzer/Android.mk b/config/power/V1_1/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..fd73150
--- /dev/null
+++ b/config/power/V1_1/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalPowerV1_1IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/power/V1_1/iface_fuzzer/AndroidTest.xml b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..d7c88c1
--- /dev/null
+++ b/config/power/V1_1/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalPowerV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalPowerV1_1IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.power@1.1"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/radio/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/V1_0/func_fuzzer/AndroidTest.xml
index a49019a..7d12785 100644
--- a/config/radio/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.0"/>

diff --git a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
index 3e93753..68a0ca9 100644
--- a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.0"/>

diff --git a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
index e2bca87..6a93904 100644
--- a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.1"/>

diff --git a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
index 8232908..e6c4a41 100644
--- a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioDeprecatedV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>

diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
index 9bf56de..f4e1f40 100644
--- a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioDeprecatedV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>

diff --git a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
index 563cc37..f046903 100644
--- a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRenderscriptV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>

diff --git a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
index 4029dad..6a6508d 100644
--- a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRenderscriptV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>

diff --git a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
index 390da82..e0e3c7b 100644
--- a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSensorsV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>

diff --git a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
index c69ca41..c27324e 100644
--- a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSensorsV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>

diff --git a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
index 63f8ee7..ebb4af5 100644
--- a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSoundtriggerV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>

diff --git a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
index 6f5f739..8f22b3d 100644
--- a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSoundtriggerV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>

diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
index 81ebdc3..8c00756 100644
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTetheroffloadConfigV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tetheroffload.config@1.0"/>

diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
index 79b2833..89b282b 100644
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTetheroffloadControlV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tetheroffload.control@1.0"/>

diff --git a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
index e58dd5a..ed2d13a 100644
--- a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalThermalV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>

diff --git a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
index e97078b..7fca3f4 100644
--- a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalThermalV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>

diff --git a/config/thermal/V1_1/iface_fuzzer/Android.mk b/config/thermal/V1_1/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..f371ea3
--- /dev/null
+++ b/config/thermal/V1_1/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalThermalV1_1IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..c9cb843
--- /dev/null
+++ b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalThermalV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalThermalV1_1IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.thermal@1.1"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
index 32a96b0..4a5491b 100644
--- a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvCecV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.cec@1.0"/>

diff --git a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
index 40b8b1d..8f0d925 100644
--- a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvCecV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.cec@1.0"/>

diff --git a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
index 8953c3a..7c8791a 100644
--- a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvInputV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>

diff --git a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
index 9d581c6..e224f64 100644
--- a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvInputV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>

diff --git a/config/usb/V1_0/func_fuzzer/AndroidTest.xml b/config/usb/V1_0/func_fuzzer/AndroidTest.xml
index 1134378..5194850 100644
--- a/config/usb/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalUsbV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>

diff --git a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
index a16663a..9eb4086 100644
--- a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalUsbV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>

diff --git a/config/usb/V1_1/iface_fuzzer/Android.mk b/config/usb/V1_1/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..3082a08
--- /dev/null
+++ b/config/usb/V1_1/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalUsbV1_1IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..a82b4c1
--- /dev/null
+++ b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalUsbV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalUsbV1_1IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.usb@1.1"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
index 623b8ab..98101bc 100644
--- a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVibratorV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>

diff --git a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
index 283c8ed..4893a90 100644
--- a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVibratorV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>

diff --git a/config/vibrator/V1_1/iface_fuzzer/Android.mk b/config/vibrator/V1_1/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..b69c673
--- /dev/null
+++ b/config/vibrator/V1_1/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalVibratorV1_1IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..1ec5566
--- /dev/null
+++ b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalVibratorV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalVibratorV1_1IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.1"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/vr/V1_0/func_fuzzer/AndroidTest.xml b/config/vr/V1_0/func_fuzzer/AndroidTest.xml
index e61d638..a3214d2 100644
--- a/config/vr/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVrV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>

diff --git a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
index 93e7e45..932409e 100644
--- a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVrV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>

diff --git a/config/weaver/V1_0/iface_fuzzer/Android.mk b/config/weaver/V1_0/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..f4f4a84
--- /dev/null
+++ b/config/weaver/V1_0/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalWeaverV1_0IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..69a6267
--- /dev/null
+++ b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalWeaverV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalWeaverV1_0IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.weaver@1.0"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
index 6543951..eecc26d 100644
--- a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>

diff --git a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
index 8519fc5..b8b957a 100644
--- a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>

diff --git a/config/wifi/V1_1/iface_fuzzer/Android.mk b/config/wifi/V1_1/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..5dc99ce
--- /dev/null
+++ b/config/wifi/V1_1/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalWifiV1_1IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..acbdda5
--- /dev/null
+++ b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalWifiV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalWifiV1_1IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.wifi@1.1"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/wifi/offload/V1_0/iface_fuzzer/Android.mk b/config/wifi/offload/V1_0/iface_fuzzer/Android.mk
new file mode 100644
index 0000000..6d494c9
--- /dev/null
+++ b/config/wifi/offload/V1_0/iface_fuzzer/Android.mk

@@ -0,0 +1,9 @@
+# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+# Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalWifiOffloadV1_0IfaceFuzzer
+include test/vts/tools/build/Android.host_config.mk

diff --git a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..4611de8
--- /dev/null
+++ b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+     Do not edit manually.
+-->
+<configuration description="Config for VtsHalWifiOffloadV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="IfaceFuzzerTest.push"/>
+    </target_preparer>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsHalWifiOffloadV1_0IfaceFuzzer"/>
+        <option name="hal-hidl-package-name" value="android.hardware.wifi.offload@1.0"/>
+        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
+        <option name="test-timeout" value="3h"/>
+    </test>
+</configuration>

diff --git a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
index 7de26af..dfc5d81 100644
--- a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiSupplicantV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>

diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
index 957a2ae..8c72760 100644
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml

@@ -7,7 +7,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiSupplicantV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>

diff --git a/script/config/template/template.xml b/script/config/template/template.xml
index 3daad00..31fe73e 100644
--- a/script/config/template/template.xml
+++ b/script/config/template/template.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="{TEST_TYPE_CAMEL}Test.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="{TEST_NAME}"/>
         <option name="hal-hidl-package-name" value="android.hardware.{HAL_NAME}@{HAL_VERSION}"/>
commit	eef8f21bd7edbb344123ac636f6886513c4318cd	[log] [tgz]
author	Hsin-Yi Chen <hsinyichen@google.com>	Wed Jan 17 07:11:03 2018 +0000
committer	android-build-merger <android-build-merger@google.com>	Wed Jan 17 07:11:03 2018 +0000
tree	53502ad840971e1de2410ddd111c456d4d81a01e
parent	88261d65364315c76acd8cbb624431eb1d3f0fb7 [diff]
parent	113d2ae57a4823db052bdf20bb7e92f8d22fffb7 [diff]