Merge "Pull corpus_trigger to directory unique to each testcase." into pi-dev am: 558bc34d8e am: fedf461097
am: cef76f57ce
Change-Id: I7b5d480f5e55ad46d8b2b8079d1f4c8dce91e8e1
diff --git a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
index 693a1f1..55131af 100644
--- a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAudioV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>
diff --git a/config/audio/V4_0/iface_fuzzer/AndroidTest.xml b/config/audio/V4_0/iface_fuzzer/AndroidTest.xml
index 73e024d..7163098 100644
--- a/config/audio/V4_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/V4_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAudioV4_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.audio@4.0"/>
diff --git a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
index 0cd0ad1..655d2a1 100644
--- a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAudioCommonV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>
diff --git a/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml
index f0f9dee..aa9f697 100644
--- a/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAudioCommonV4_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.audio.common@4.0"/>
diff --git a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
index d0f8707..74982d0 100644
--- a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAudioEffectV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>
diff --git a/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml
index 8d72e4c..03bba80 100644
--- a/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAudioEffectV4_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.audio.effect@4.0"/>
diff --git a/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml b/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml
index 9e2dfc1..364bcd2 100644
--- a/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAuthsecretV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.authsecret@1.0"/>
diff --git a/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml
index 1154ad7..100f2fe 100644
--- a/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAutomotiveAudiocontrolV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.automotive.audiocontrol@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 595acff..ab8dde8 100644
--- a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAutomotiveEvsV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>
diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
index b88e71c..262575e 100644
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalAutomotiveVehicleV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>
diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
index 696d021..ab3215c 100644
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBiometricsFingerprintV2_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>
diff --git a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
index 852cabb..21f626c 100644
--- a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBluetoothV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>
diff --git a/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml
index 5197dbf..5172d50 100644
--- a/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBluetoothA2DpV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.bluetooth.a2dp@1.0"/>
diff --git a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
index 93662d1..3eda116 100644
--- a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBootV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>
diff --git a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
index 4470c4b..9b913ee 100644
--- a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBroadcastradioV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>
diff --git a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
index bdd3632..d84ab51 100644
--- a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBroadcastradioV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>
diff --git a/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml
index b67340c..811b31b 100644
--- a/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalBroadcastradioV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.broadcastradio@2.0"/>
diff --git a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
index 48ca1b8..d6fdbae 100644
--- a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraCommonV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.common@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 1ed02d2..ce15443 100644
--- a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraDeviceV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>
diff --git a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
index a5d7657..a4533d2 100644
--- a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraDeviceV3_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>
diff --git a/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml
index 9a69700..0a8bd74 100644
--- a/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraDeviceV3_3IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.device@3.3"/>
diff --git a/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml
index 8fee955..cc16229 100644
--- a/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraDeviceV3_4IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.device@3.4"/>
diff --git a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
index 19ba17e..03f32d7 100644
--- a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraMetadataV3_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>
diff --git a/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml
index 4378124..ca91e1d 100644
--- a/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraMetadataV3_3IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.3"/>
diff --git a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
index 9da4b50..b066061 100644
--- a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalCameraProviderV2_4IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>
diff --git a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
index 0538003..49d3161 100644
--- a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
index b1dc632..e3c66a8 100644
--- a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
index c7c8b28..5070bd5 100644
--- a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>
diff --git a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
index b8cecb1..91c89ab 100644
--- a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml b/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml
index 4bbfd3d..f3097b1 100644
--- a/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalConfirmationuiV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.confirmationui@1.0"/>
diff --git a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
index 436490a..6e75f9a 100644
--- a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalContexthubV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>
diff --git a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
index 9fa8e07..bad0f40 100644
--- a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalDrmV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>
diff --git a/config/drm/V1_1/iface_fuzzer/AndroidTest.xml b/config/drm/V1_1/iface_fuzzer/AndroidTest.xml
index 94c2ba6..f5a82be 100644
--- a/config/drm/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalDrmV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.drm@1.1"/>
diff --git a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
index d2e268b..f709641 100644
--- a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalDumpstateV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>
diff --git a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
index 1e565fb..52981ae 100644
--- a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGatekeeperV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>
diff --git a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
index f65094a..ce57486 100644
--- a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGnssV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>
diff --git a/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml
index 177887c..3690fec 100644
--- a/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGnssV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.gnss@1.1"/>
diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
index d2f7e5d..e2a0221 100644
--- a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsAllocatorV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>
diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
index 3892223..2a15f05 100644
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsBufferqueueV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@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 6449d6c..15cf5d1 100644
--- a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsCommonV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>
diff --git a/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml
index 74cb85a..16b8363 100644
--- a/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsCommonV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.1"/>
diff --git a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
index 678c171..4aa2926 100644
--- a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsComposerV2_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>
diff --git a/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml
index d4fe9c8..713f3a2 100644
--- a/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsComposerV2_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.2"/>
diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
index fa443db..27a3533 100644
--- a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsMapperV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>
diff --git a/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml
index 6702b6d..e515199 100644
--- a/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalGraphicsMapperV2_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.1"/>
diff --git a/config/health/V1_0/iface_fuzzer/AndroidTest.xml b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
index 0cef0fd..98daddf 100644
--- a/config/health/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalHealthV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>
diff --git a/config/health/V2_0/iface_fuzzer/AndroidTest.xml b/config/health/V2_0/iface_fuzzer/AndroidTest.xml
index 889ccd1..291f122 100644
--- a/config/health/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/health/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalHealthV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.health@2.0"/>
diff --git a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
index 7596c05..9599b21 100644
--- a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalIrV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>
diff --git a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
index 80f681b..2484e9e 100644
--- a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalKeymasterV3_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>
diff --git a/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml
index 293cf1f..a86cc9f 100644
--- a/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalKeymasterV4_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.keymaster@4.0"/>
diff --git a/config/light/V2_0/iface_fuzzer/AndroidTest.xml b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
index d25c9f8..21d1fcc 100644
--- a/config/light/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalLightV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>
diff --git a/config/media/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
index 4f045f6..2ccacd1 100644
--- a/config/media/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalMediaV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>
diff --git a/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml
index 2c5000b..5b416d5 100644
--- a/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalMediaBufferpoolV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.media.bufferpool@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 3b9df4c..f13befc 100644
--- a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalMediaOmxV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>
diff --git a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
index 2c4b6cf..3423d0f 100644
--- a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalMemtrackV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>
diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
index 90d61b0..6f3fd6a 100644
--- a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml
index dbf0803..11a73c5 100644
--- a/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.neuralnetworks@1.1"/>
diff --git a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
index 3ac90bc..9f51098 100644
--- a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalNfcV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>
diff --git a/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml
index 05f1928..4708644 100644
--- a/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalNfcV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.nfc@1.1"/>
diff --git a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
index 0eff014..f2b972a 100644
--- a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/power/V1_0/iface_fuzzer/AndroidTest.xml b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
index 525eb14..088ea7c 100644
--- a/config/power/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>
diff --git a/config/power/V1_1/iface_fuzzer/AndroidTest.xml b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
index d7c88c1..e0909c4 100644
--- a/config/power/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/power/V1_2/iface_fuzzer/AndroidTest.xml b/config/power/V1_2/iface_fuzzer/AndroidTest.xml
index 202cdbb..353624c 100644
--- a/config/power/V1_2/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.power@1.2"/>
diff --git a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
index 68a0ca9..ac012b7 100644
--- a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="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 6a93904..c00e785 100644
--- a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalRadioV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.radio@1.1"/>
diff --git a/config/radio/V1_2/iface_fuzzer/AndroidTest.xml b/config/radio/V1_2/iface_fuzzer/AndroidTest.xml
index f316be9..747ff61 100644
--- a/config/radio/V1_2/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalRadioV1_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.radio@1.2"/>
diff --git a/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml
index 628d105..f54b9fd 100644
--- a/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalRadioConfigV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.radio.config@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 f4e1f40..5388b37 100644
--- a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalRadioDeprecatedV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>
diff --git a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
index 6a6508d..839ad30 100644
--- a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalRenderscriptV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>
diff --git a/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml b/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml
index 7897fe4..14d5a91 100644
--- a/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalSecure_ElementV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.secure_element@1.0"/>
diff --git a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
index c27324e..856c3f1 100644
--- a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalSensorsV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>
diff --git a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
index 8f22b3d..7b7df89 100644
--- a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalSoundtriggerV2_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>
diff --git a/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml
index 64ba8a0..84f3521 100644
--- a/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalSoundtriggerV2_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.1"/>
diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
index 8c00756..325ebdd 100644
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="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 89b282b..0e8c2b8 100644
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalTetheroffloadControlV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.tetheroffload.control@1.0"/>
diff --git a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
index 7fca3f4..8476ad5 100644
--- a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>
diff --git a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
index c9cb843..e7ea0f8 100644
--- a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
index 8f0d925..bd57c1d 100644
--- a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalTvCecV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.tv.cec@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 e224f64..dfe4618 100644
--- a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalTvInputV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>
diff --git a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
index 9eb4086..24badf4 100644
--- a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>
diff --git a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
index a82b4c1..071893d 100644
--- a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml
index 8820c88..b600e84 100644
--- a/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalUsbGadgetV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.usb.gadget@1.0"/>
diff --git a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
index 4893a90..470742c 100644
--- a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>
diff --git a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
index 1ec5566..b745be0 100644
--- a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml
index 980d41b..1aeddf5 100644
--- a/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.vibrator@1.2"/>
diff --git a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
index 932409e..9b3e649 100644
--- a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalVrV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>
diff --git a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
index 69a6267..884d85b 100644
--- a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
index b8b957a..ba2efc8 100644
--- a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>
diff --git a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
index acbdda5..020f68e 100644
--- a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml
index 910711b..e54f774 100644
--- a/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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_2IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.wifi@1.2"/>
diff --git a/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml
index 9097c77..91185eb 100644
--- a/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalWifiHostapdV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.wifi.hostapd@1.0"/>
diff --git a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
index 4611de8..c684a48 100644
--- a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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"/>
diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
index 8c72760..1a05b63 100644
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalWifiSupplicantV1_0IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>
diff --git a/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml
index 9b4ab1d..ab57785 100644
--- a/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
<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="VtsHalWifiSupplicantV1_1IfaceFuzzer"/>
<option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.1"/>
diff --git a/iface_fuzzer/OWNERS b/iface_fuzzer/OWNERS
new file mode 100644
index 0000000..3bbea12
--- /dev/null
+++ b/iface_fuzzer/OWNERS
@@ -0,0 +1,3 @@
+trong@google.com
+jiwonshin@google.com
+yim@google.com
diff --git a/iface_fuzzer/ProtoFuzzerMain.cpp b/iface_fuzzer/ProtoFuzzerMain.cpp
index 9eec3a9..0c4a8c9 100644
--- a/iface_fuzzer/ProtoFuzzerMain.cpp
+++ b/iface_fuzzer/ProtoFuzzerMain.cpp
@@ -122,33 +122,68 @@
// 1. It can't be serialized from the given buffer OR
// 2. The runner has opened interfaces that have not been touched.
// Otherwise, the Execution is mutated.
- bool createNew =
- !FromArray(data, size, &exec_spec) || runner->UntouchedIfaces();
+ if (!FromArray(data, size, &exec_spec) || runner->UntouchedIfaces()) {
+ exec_spec =
+ mutator->RandomGen(runner->GetOpenedIfaces(), params.exec_size_);
+ } else {
+ mutator->Mutate(runner->GetOpenedIfaces(), &exec_spec);
+ }
- int counter = 0;
- do {
- if (createNew) {
- exec_spec =
- mutator->RandomGen(runner->GetOpenedIfaces(), params.exec_size_);
- } else {
- mutator->Mutate(runner->GetOpenedIfaces(), &exec_spec);
- }
- } while ((size_t)exec_spec.ByteSize() > max_size && counter++ < 1000);
-
- if ((size_t)exec_spec.ByteSize() > max_size) {
+ if (static_cast<size_t>(exec_spec.ByteSize()) > max_size) {
cerr << "execution specification message exceeded maximum size." << endl;
+ cerr << max_size << endl;
+ cerr << static_cast<size_t>(exec_spec.ByteSize()) << endl;
std::abort();
}
- return ToArray(data, size, &exec_spec);
+ return ToArray(data, max_size, &exec_spec);
}
-// TODO(trong): implement a meaningful cross-over mechanism.
-size_t LLVMFuzzerCustomCrossOver(const uint8_t *data1, size_t size1,
- const uint8_t *data2, size_t size2,
- uint8_t *out, size_t max_out_size,
- unsigned int seed) {
- memcpy(out, data1, size1);
- return size1;
+extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t *data1, size_t size1,
+ const uint8_t *data2, size_t size2,
+ uint8_t *out, size_t max_out_size,
+ unsigned int seed) {
+ ExecSpec exec_spec1{};
+ FromArray(data1, size1, &exec_spec1);
+ int function_call_size1 = exec_spec1.function_call_size();
+
+ ExecSpec exec_spec2{};
+ FromArray(data2, size2, &exec_spec2);
+ int function_call_size2 = exec_spec2.function_call_size();
+
+ if (function_call_size1 != static_cast<int>(params.exec_size_)) {
+ if (function_call_size2 != static_cast<int>(params.exec_size_)) {
+ cerr << "Both messages were invalid, aborting." << endl;
+ std::abort();
+ } else {
+ cerr << "Message 1 was invalid, copying message 2." << endl;
+ memcpy(out, data2, size2);
+ return size2;
+ }
+ } else if (function_call_size2 != static_cast<int>(params.exec_size_)) {
+ cerr << "Message 2 was invalid, copying message 1." << endl;
+ memcpy(out, data1, size1);
+ return size1;
+ }
+
+ ExecSpec exec_spec_out{};
+ for (int i = 0; i < static_cast<int>(params.exec_size_); i++) {
+ FuncCall temp;
+ int dice = rand() % 2;
+ if (dice == 0) {
+ temp = exec_spec1.function_call(i);
+ } else {
+ temp = exec_spec2.function_call(i);
+ }
+ exec_spec_out.add_function_call()->CopyFrom(temp);
+ }
+
+ if (static_cast<size_t>(exec_spec_out.ByteSize()) > max_out_size) {
+ cerr << "execution specification message exceeded maximum size." << endl;
+ cerr << max_out_size << endl;
+ cerr << static_cast<size_t>(exec_spec_out.ByteSize()) << endl;
+ std::abort();
+ }
+ return ToArray(out, max_out_size, &exec_spec_out);
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
diff --git a/OWNERS b/kernel/OWNERS
similarity index 100%
rename from OWNERS
rename to kernel/OWNERS
diff --git a/kernel/__init__.py b/kernel/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/kernel/__init__.py
diff --git a/kernel/syzkaller/Android.mk b/kernel/syzkaller/Android.mk
new file mode 100644
index 0000000..01f29b0
--- /dev/null
+++ b/kernel/syzkaller/Android.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsKernelFuzzTest
+include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/kernel/syzkaller/AndroidTest.xml b/kernel/syzkaller/AndroidTest.xml
new file mode 100644
index 0000000..3863ab6
--- /dev/null
+++ b/kernel/syzkaller/AndroidTest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for VTS Fuzz-Kernel test case">
+ <option name="config-descriptor:metadata" key="plan" value="vts-fuzz-kernel" />
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsKernelFuzzTest"/>
+ <option name="test-case-path" value="vts/testcases/fuzz/kernel/syzkaller/syzkaller_test" />
+ </test>
+</configuration>
diff --git a/kernel/syzkaller/__init__.py b/kernel/syzkaller/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/kernel/syzkaller/__init__.py
diff --git a/kernel/syzkaller/environment_variables.py b/kernel/syzkaller/environment_variables.py
new file mode 100644
index 0000000..3cd57a4
--- /dev/null
+++ b/kernel/syzkaller/environment_variables.py
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+syzkaller_dir = 'syzkaller' # tmp/tmp8214/syzkaller
+syzkaller_bin_dir = 'syzkaller/bin' # tmp/tmp8214/syzkaller/bin
+syzkaller_work_dir = 'syzkaller_work' # tmp/tmp8214/syzkaller_work
+template_cfg = 'syzkaller_template.cfg' # tmp/tmp8214/syzkaller_template.cfg
diff --git a/kernel/syzkaller/syzkaller_test.py b/kernel/syzkaller/syzkaller_test.py
new file mode 100644
index 0000000..5d30d73
--- /dev/null
+++ b/kernel/syzkaller/syzkaller_test.py
@@ -0,0 +1,156 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import logging
+import os
+import shutil
+import tempfile
+
+import environment_variables as env
+import syzkaller_test_case
+
+from vts.runners.host import asserts
+from vts.runners.host import base_test
+from vts.runners.host import config_parser
+from vts.runners.host import keys
+from vts.runners.host import test_runner
+from vts.utils.python.common import cmd_utils
+from vts.utils.python.controllers import adb
+from vts.utils.python.controllers import android_device
+from vts.utils.python.gcs import gcs_api_utils
+
+
+class SyzkallerTest(base_test.BaseTestClass):
+ """Runs Syzkaller tests on target."""
+
+ start_vts_agents = False
+
+ def setUpClass(self):
+ """Creates a remote shell instance, and copies data files.
+
+ Attributes:
+ _env: dict, a mapping from key to environment path of this test.
+ _gcs_api_utils: a GcsApiUtils object used for uploading logs.
+ _dut: an android device controller object used for getting device info.
+ """
+
+ required_params = [
+ keys.ConfigKeys.IKEY_SERVICE_JSON_PATH,
+ keys.ConfigKeys.IKEY_FUZZING_GCS_BUCKET_NAME,
+ keys.ConfigKeys.IKEY_SYZKALLER_PACKAGES_PATH,
+ keys.ConfigKeys.IKEY_SYZKALLER_TEMPLATE_PATH
+ ]
+ self.getUserParams(required_params)
+
+ _temp_dir = tempfile.mkdtemp()
+ self._env = dict()
+ self._env['temp_dir'] = _temp_dir
+ self._env['syzkaller_dir'] = os.path.join(_temp_dir, env.syzkaller_dir)
+ self._env['syzkaller_bin_dir'] = os.path.join(_temp_dir,
+ env.syzkaller_bin_dir)
+ self._env['syzkaller_work_dir'] = os.path.join(_temp_dir,
+ env.syzkaller_work_dir)
+ self._env['template_cfg'] = os.path.join(_temp_dir, env.template_cfg)
+
+ self._gcs_api_utils = gcs_api_utils.GcsApiUtils(
+ self.service_key_json_path, self.fuzzing_gcs_bucket_name)
+ self._dut = self.android_devices[0]
+
+ def FetchSyzkaller(self):
+ """Fetch Syzkaller program from x20 and make sure files are executable."""
+ try:
+ logging.info('Fetching Syzkaller program.')
+ shutil.copytree(self.syzkaller_packages_path,
+ self._env['syzkaller_dir'])
+ logging.info('Fetching Syzkaller template configuration.')
+ shutil.copy(self.syzkaller_template_path, self._env['temp_dir'])
+ except IOError, e:
+ logging.exception(e)
+ self.skipAllTests(
+ 'Syzkaller program is not available. Skipping all tests.')
+
+ for root, dirs, files in os.walk(self._env['syzkaller_bin_dir']):
+ for filepath in files:
+ os.chmod(os.path.join(root, filepath), 0755)
+
+ def CreateTestCases(self):
+ """Create syzkaller test cases.
+
+ Returns:
+ test_cases, list, the list of test_cases for this test.
+ """
+ test_cases = []
+ test_cases.append(
+ syzkaller_test_case.SyzkallerTestCase(self._env, 'linux/arm64',
+ self._dut.serial, 'adb',
+ 'false', 12))
+ return test_cases
+
+ def RunTestCase(self, test_case):
+ """Run a syzkaller test case.
+
+ Args:
+ test_case: SyzkallerTestCase object, the test case to run.
+ """
+ test_command = test_case.GetRunCommand()
+ stdout, stderr, err_code = cmd_utils.ExecuteOneShellCommand(
+ test_command, timeout=18000)
+ if err_code:
+ logging.error(stderr)
+ else:
+ logging.info(stdout)
+ self.ReportTestCase(test_case)
+
+ def ReportTestCase(self, test_case):
+ """Asserts the result of the test case and uploads report to GCS.
+
+ Args:
+ test_case: SyzkallerTestCase object, the test case to report.
+ """
+ self.AssertTestCaseResult(test_case)
+ self._gcs_api_utils.UploadDir(test_case._work_dir_path,
+ 'kernelfuzz_reports')
+
+ def AssertTestCaseResult(self, test_case):
+ """Asserts that test case finished as expected.
+
+ If crash reports were generated during the test, reports test as failure.
+ If crash reports were not generated during the test, reports test as success.
+
+ Args:
+ test_case: SyzkallerTestCase object, the test case to assert
+ as failure or success.
+ """
+ logging.info('Test case results.')
+ crash_dir = os.path.join(test_case._work_dir_path, 'crashes')
+ if os.listdir(crash_dir) == []:
+ logging.info('%s did not cause crash in our device.',
+ test_case._test_name)
+ else:
+ asserts.fail('%s caused crash in our device.',
+ test_case._test_name)
+
+ def generateKernelFuzzerTests(self):
+ """Runs kernel fuzzer tests."""
+ self.FetchSyzkaller()
+ self.runGeneratedTests(
+ test_func=self.RunTestCase,
+ settings=self.CreateTestCases(),
+ name_func=lambda x: x._test_name)
+
+
+if __name__ == '__main__':
+ test_runner.main()
diff --git a/kernel/syzkaller/syzkaller_test_case.py b/kernel/syzkaller/syzkaller_test_case.py
new file mode 100644
index 0000000..876fbf6
--- /dev/null
+++ b/kernel/syzkaller/syzkaller_test_case.py
@@ -0,0 +1,115 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import logging
+import os
+import time
+
+import environment_variables as env
+
+
+class SyzkallerTestCase(object):
+ """Represents syzkaller test case.
+
+ Attributes:
+ _env: dict, inverted map of environment varialbes for this test.
+ _device_target: string, OS of the target device.
+ _device_code: string, serial number of the target device.
+ _device_type: string, type of the target device.
+ _reproduce: boolean, whether or not to reproduce if a crash is found.
+ _http: integer, path to localhost where the test information will be shown.
+ _procs: integer, number of processes this test case will use if available.
+ _test_name: string, the unique name for this test case.
+ _work_dir_path: string, path to the work directory for this test case.
+ _config_file_path: string, path to the config file for this test case.
+ """
+
+ def __init__(self, env, device_target, device_code, device_type, reproduce,
+ procs):
+ self._env = env
+ self._device_target = device_target
+ self._device_code = device_code
+ self._device_type = device_type
+ self._reproduce = reproduce
+ self._http = 'localhost:50000'
+ self._procs = procs
+ self._test_name = self.GenerateTestName()
+ self._work_dir_path = self.GenerateCorpusDir()
+ self._config_file_path = self.GenerateConfigFile()
+
+ def GenerateTestName(self):
+ """Uses device code and time to create unique name
+
+ Returns:
+ test_name, string, the unique test name for this test case.
+ """
+ test_name = '%s_%s_%d' % (time.strftime('%Y-%m-%d'), self._device_code,
+ int(time.time()))
+ return str(test_name)
+
+ def GenerateCorpusDir(self):
+ """Creates working directory for this test case.
+
+ Returns:
+ work_dir_path, string, path to the working directory for this test case.
+ """
+ work_dir_path = os.path.join(self._env['syzkaller_work_dir'],
+ self._test_name)
+ if not os.path.exists(work_dir_path):
+ os.makedirs(work_dir_path)
+ return work_dir_path
+
+ def GenerateConfigFile(self):
+ """Creates configuration file for this test case.
+
+ Returns:
+ config_file_path, string, path to the configuration file for this test case.
+ """
+
+ # read template config
+ with open(self._env['template_cfg'], 'r') as temp:
+ template_cfg = str(temp.read())
+
+ # fill out template
+ template_cfg = template_cfg.replace('{device_target}',
+ self._device_target)
+ template_cfg = template_cfg.replace('{reproduce}', self._reproduce)
+ template_cfg = template_cfg.replace('{work_dir_path}',
+ self._work_dir_path)
+ template_cfg = template_cfg.replace('{http}', self._http)
+ template_cfg = template_cfg.replace('{syzkaller_dir_path}',
+ self._env['syzkaller_dir'])
+ template_cfg = template_cfg.replace('{device_code}', self._device_code)
+ template_cfg = template_cfg.replace('{device_type}', self._device_type)
+ template_cfg = template_cfg.replace('{procs}', str(self._procs))
+
+ # save config file
+ config_file_path = self._work_dir_path + str('.cfg')
+ with open(config_file_path, 'w') as config_file:
+ config_file.write(template_cfg)
+ return config_file_path
+
+ def GetRunCommand(self):
+ """Creates test run command for this case.
+
+ Returns:
+ test_command, string, test run command for this test case.
+ """
+ syz_manager_path = os.path.join(self._env['syzkaller_bin_dir'],
+ 'syz-manager')
+ test_command = '%s -config=%s' % (syz_manager_path,
+ self._config_file_path)
+ return test_command
diff --git a/template/func_fuzzer_test/func_fuzzer_test.py b/template/func_fuzzer_test/func_fuzzer_test.py
index b9ea472..c204caf 100644
--- a/template/func_fuzzer_test/func_fuzzer_test.py
+++ b/template/func_fuzzer_test/func_fuzzer_test.py
@@ -58,7 +58,7 @@
self._vts_spec_parser = vts_spec_utils.VtsSpecParser(
self.data_file_path)
self._temp_dir = tempfile.mkdtemp()
- self._corpus_manager = corpus_manager.CorpusManager(self.user_params)
+ self._corpus_manager = corpus_manager.CorpusManager(self.user_params, self._dut)
def _RegisteredInterfaces(self, hal_package):
"""Returns a list of registered interfaces for a given hal package.
diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py
index 35fd53b..bfdd973 100644
--- a/template/iface_fuzzer_test/iface_fuzzer_test.py
+++ b/template/iface_fuzzer_test/iface_fuzzer_test.py
@@ -37,6 +37,8 @@
"""
_VTS_SPEC_DIR_TARGET = os.path.join(config.FUZZER_TEST_DIR, 'spec')
+ start_vts_agents = False
+
def _PushVtsResources(self, hal_name, hal_version):
"""Pushes resources needed for test to target device.
@@ -75,11 +77,12 @@
string list, directories on target
"""
hal_name_dir = vts_spec_utils.HalNameDir(hal_name)
- spec_dirs = [os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir,
- hal_version)]
+ spec_dirs = [
+ os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir, hal_version)
+ ]
- imported_hals = self._vts_spec_parser.ImportedHals(hal_name,
- hal_version)
+ imported_hals = self._vts_spec_parser.ImportedHals(
+ hal_name, hal_version)
for name, version in imported_hals:
spec_dirs.append(
os.path.join(self._VTS_SPEC_DIR_TARGET,
@@ -93,8 +96,8 @@
hal_name, hal_version = vts_spec_utils.HalPackageToNameAndVersion(
hal_package)
- imported_hals = self._vts_spec_parser.IndirectImportedHals(hal_name,
- hal_version)
+ imported_hals = self._vts_spec_parser.IndirectImportedHals(
+ hal_name, hal_version)
self._PushVtsResources(hal_name, hal_version)
for name, version in imported_hals:
self._PushVtsResources(name, version)
diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py
index d72f346..239bc99 100644
--- a/template/libfuzzer_test/libfuzzer_test.py
+++ b/template/libfuzzer_test/libfuzzer_test.py
@@ -38,6 +38,8 @@
_dut: AndroidDevice, the device under test as config.
"""
+ start_vts_agents = False
+
def setUpClass(self):
"""Creates a remote shell instance, and copies data files."""
required_params = [
@@ -106,11 +108,11 @@
"""
inuse_seed = self._corpus_manager.FetchCorpusSeed(
test_case._test_name, self._temp_dir)
- local_corpus_seed = os.path.join(
+ local_corpus_seed_dir = os.path.join(
self._temp_dir, '%s_corpus_seed' % test_case._test_name)
- if inuse_seed is not None and os.path.exists(
- local_corpus_seed) and os.listdir(local_corpus_seed):
- self._dut.adb.push(local_corpus_seed, config.FUZZER_TEST_DIR)
+ if os.path.exists(local_corpus_seed_dir) and os.listdir(
+ local_corpus_seed_dir):
+ self._dut.adb.push(local_corpus_seed_dir, config.FUZZER_TEST_DIR)
else:
corpus_seed = test_case.GetCorpusSeedDir()
self._dut.adb.shell('mkdir %s -p' % corpus_seed)
@@ -151,16 +153,15 @@
Raises:
signals.TestFailure when the testcase failed.
"""
- if 'return_codes' in result and \
- result['return_codes'] == config.ExitCode.FUZZER_TEST_PASS:
+ return_codes = result.get('return_codes', None)
+ if return_codes == config.ExitCode.FUZZER_TEST_PASS:
logging.info(
'adb shell fuzzing command exited normally with exitcode %d.',
result['return_codes'])
if inuse_seed is not None:
self._corpus_manager.InuseToDest(test_case._test_name,
inuse_seed, 'corpus_complete')
- elif 'return_codes' in result and \
- result['return_codes'] == config.ExitCode.FUZZER_TEST_FAIL:
+ elif return_codes == config.ExitCode.FUZZER_TEST_FAIL:
logging.info(
'adb shell fuzzing command exited normally with exitcode %d.',
result['return_codes'])
@@ -182,6 +183,11 @@
self.PushFiles(test_case.bin_host_path)
self.CreateCorpusOut(test_case)
inuse_seed = self.RetrieveCorpusSeed(test_case)
+ if inuse_seed == 'locked':
+ # skip this test case
+ logging.warning('test case locked, skipping testcase %s.', test_case.test_name)
+ return
+
fuzz_cmd = '"%s"' % test_case.GetRunCommand()
result = {}
@@ -191,10 +197,11 @@
logging.exception(e)
corpus_trigger_dir = os.path.join(self._temp_dir,
- test_case.GetCorpusTriggerDir())
+ test_case.GetCorpusTriggerDir())
os.makedirs(corpus_trigger_dir)
try:
- self._dut.adb.pull(config.FUZZER_TEST_CRASH_REPORT, corpus_trigger_dir)
+ self._dut.adb.pull(config.FUZZER_TEST_CRASH_REPORT,
+ corpus_trigger_dir)
except adb.AdbError as e:
logging.exception(e)
logging.error('crash report was not created during test run.')
@@ -206,8 +213,11 @@
self._temp_dir)
except adb.AdbError as e:
logging.exception(e)
+ logging.error('Device failed. Removing lock from GCS.')
+ self._corpus_manager.remove_lock(test_case._test_name)
- self.EvaluateTestcase(test_case, result, inuse_seed)
+ if inuse_seed is not 'directory':
+ self.EvaluateTestcase(test_case, result, inuse_seed)
self.AssertTestResult(test_case, result)
def LogCrashReport(self, test_case):
