Add metadata to modules in test/vts-testcase/fuzz am: b9c7c40a32 am: d23de70987 am: 6dc0500ce1 am: 8d5000d37a Change-Id: I3e5bb98545da6a29cbc95deca1c5c2ee496b5daa

commit: bc19455b588b4c27d5284193344bbffebd498cb4 [log] [tgz]
author: Hsin-Yi Chen <hsinyichen@google.com> Fri Jan 26 21:38:57 2018 +0000
committer: android-build-merger <android-build-merger@google.com> Fri Jan 26 21:38:57 2018 +0000
tree: 452b75a1600e886483060a8a6fc0b27f7fa19138
parent: 5d4da3de43b7366878bc472382aee3f2e0d69189 [diff]
parent: 8d5000d37a18c0d8e437fc52157dffd1281c5a2c [diff]
diff --git a/Android.bp b/Android.bp
index d7d401a..efaec38 100644
--- a/Android.bp
+++ b/Android.bp

@@ -13,6 +13,5 @@
 // limitations under the License.
 
 subdirs = [
-    "func_fuzzer",
     "iface_fuzzer",
 ]

diff --git a/config/audio/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/V2_0/func_fuzzer/AndroidTest.xml
index 8d879a8..7d8e800 100644
--- a/config/audio/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/func_fuzzer/AndroidTest.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
new file mode 100644
index 0000000..89b282b
--- /dev/null
+++ b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/func_fuzzer/Android.bp b/func_fuzzer/Android.bp
deleted file mode 100644
index da7e46a..0000000
--- a/func_fuzzer/Android.bp
+++ /dev/null

@@ -1,12 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "*",
-]
-
-cc_defaults {
-    name: "func_fuzzer_defaults",
-    static_libs: [
-        "libFuzzer"
-    ],
-}

diff --git a/func_fuzzer/audio/Android.bp b/func_fuzzer/audio/Android.bp
deleted file mode 100644
index 12e7240..0000000
--- a/func_fuzzer/audio/Android.bp
+++ /dev/null

@@ -1,7 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V2_0",
-    "common/V2_0",
-    "effect/V2_0",
-]

diff --git a/func_fuzzer/audio/V2_0/Android.bp b/func_fuzzer/audio/V2_0/Android.bp
deleted file mode 100644
index 3188a16..0000000
--- a/func_fuzzer/audio/V2_0/Android.bp
+++ /dev/null

@@ -1,200 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.Device_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
-    srcs: [
-        ":android.hardware.audio@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/2.0/Device.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.Device",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio@2.0-vts.func_fuzzer.Device_genc++"],
-    shared_libs: [
-        "android.hardware.audio@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.DevicesFactory_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
-    srcs: [
-        ":android.hardware.audio@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/2.0/DevicesFactory.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.DevicesFactory",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio@2.0-vts.func_fuzzer.DevicesFactory_genc++"],
-    shared_libs: [
-        "android.hardware.audio@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.PrimaryDevice_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
-    srcs: [
-        ":android.hardware.audio@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/2.0/PrimaryDevice.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.PrimaryDevice",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio@2.0-vts.func_fuzzer.PrimaryDevice_genc++"],
-    shared_libs: [
-        "android.hardware.audio@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.Stream_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
-    srcs: [
-        ":android.hardware.audio@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/2.0/Stream.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.Stream",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio@2.0-vts.func_fuzzer.Stream_genc++"],
-    shared_libs: [
-        "android.hardware.audio@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.StreamIn_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
-    srcs: [
-        ":android.hardware.audio@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/2.0/StreamIn.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.StreamIn",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio@2.0-vts.func_fuzzer.StreamIn_genc++"],
-    shared_libs: [
-        "android.hardware.audio@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.StreamOut_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
-    srcs: [
-        ":android.hardware.audio@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/2.0/StreamOut.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio@2.0-vts.func_fuzzer.StreamOut",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio@2.0-vts.func_fuzzer.StreamOut_genc++"],
-    shared_libs: [
-        "android.hardware.audio@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/audio/common/V2_0/Android.bp b/func_fuzzer/audio/common/V2_0/Android.bp
deleted file mode 100644
index 61bf858..0000000
--- a/func_fuzzer/audio/common/V2_0/Android.bp
+++ /dev/null

@@ -1,2 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.

diff --git a/func_fuzzer/audio/effect/V2_0/Android.bp b/func_fuzzer/audio/effect/V2_0/Android.bp
deleted file mode 100644
index 52902e1..0000000
--- a/func_fuzzer/audio/effect/V2_0/Android.bp
+++ /dev/null

@@ -1,431 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.AcousticEchoCancelerEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/AcousticEchoCancelerEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.AcousticEchoCancelerEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.AcousticEchoCancelerEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.AutomaticGainControlEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/AutomaticGainControlEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.AutomaticGainControlEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.AutomaticGainControlEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.BassBoostEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/BassBoostEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.BassBoostEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.BassBoostEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.DownmixEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/DownmixEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.DownmixEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.DownmixEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.Effect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/Effect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.Effect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.Effect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.EffectsFactory_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/EffectsFactory.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.EffectsFactory",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.EffectsFactory_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.EnvironmentalReverbEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/EnvironmentalReverbEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.EnvironmentalReverbEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.EnvironmentalReverbEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.EqualizerEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/EqualizerEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.EqualizerEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.EqualizerEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.LoudnessEnhancerEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/LoudnessEnhancerEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.LoudnessEnhancerEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.LoudnessEnhancerEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.NoiseSuppressionEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/NoiseSuppressionEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.NoiseSuppressionEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.NoiseSuppressionEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.PresetReverbEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/PresetReverbEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.PresetReverbEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.PresetReverbEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.VirtualizerEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/VirtualizerEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.VirtualizerEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.VirtualizerEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.VisualizerEffect_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
-    srcs: [
-        ":android.hardware.audio.effect@2.0_hal",
-    ],
-    out: [
-        "android/hardware/audio/effect/2.0/VisualizerEffect.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.audio.effect@2.0-vts.func_fuzzer.VisualizerEffect",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.audio.effect@2.0-vts.func_fuzzer.VisualizerEffect_genc++"],
-    shared_libs: [
-        "android.hardware.audio.effect@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/automotive/Android.bp b/func_fuzzer/automotive/Android.bp
deleted file mode 100644
index f39ccaa..0000000
--- a/func_fuzzer/automotive/Android.bp
+++ /dev/null

@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "evs/V1_0",
-    "vehicle/V2_0",
-]

diff --git a/func_fuzzer/automotive/evs/V1_0/Android.bp b/func_fuzzer/automotive/evs/V1_0/Android.bp
deleted file mode 100644
index c8090c3..0000000
--- a/func_fuzzer/automotive/evs/V1_0/Android.bp
+++ /dev/null

@@ -1,134 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsCamera_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
-    srcs: [
-        ":android.hardware.automotive.evs@1.0_hal",
-    ],
-    out: [
-        "android/hardware/automotive/evs/1.0/EvsCamera.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsCamera",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsCamera_genc++"],
-    shared_libs: [
-        "android.hardware.automotive.evs@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsCameraStream_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
-    srcs: [
-        ":android.hardware.automotive.evs@1.0_hal",
-    ],
-    out: [
-        "android/hardware/automotive/evs/1.0/EvsCameraStream.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsCameraStream",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsCameraStream_genc++"],
-    shared_libs: [
-        "android.hardware.automotive.evs@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsDisplay_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
-    srcs: [
-        ":android.hardware.automotive.evs@1.0_hal",
-    ],
-    out: [
-        "android/hardware/automotive/evs/1.0/EvsDisplay.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsDisplay",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsDisplay_genc++"],
-    shared_libs: [
-        "android.hardware.automotive.evs@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsEnumerator_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
-    srcs: [
-        ":android.hardware.automotive.evs@1.0_hal",
-    ],
-    out: [
-        "android/hardware/automotive/evs/1.0/EvsEnumerator.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsEnumerator",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.automotive.evs@1.0-vts.func_fuzzer.EvsEnumerator_genc++"],
-    shared_libs: [
-        "android.hardware.automotive.evs@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/automotive/vehicle/V2_0/Android.bp b/func_fuzzer/automotive/vehicle/V2_0/Android.bp
deleted file mode 100644
index 5aaabff..0000000
--- a/func_fuzzer/automotive/vehicle/V2_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.automotive.vehicle@2.0-vts.func_fuzzer.Vehicle_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
-    srcs: [
-        ":android.hardware.automotive.vehicle@2.0_hal",
-    ],
-    out: [
-        "android/hardware/automotive/vehicle/2.0/Vehicle.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.automotive.vehicle@2.0-vts.func_fuzzer.Vehicle",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.automotive.vehicle@2.0-vts.func_fuzzer.Vehicle_genc++"],
-    shared_libs: [
-        "android.hardware.automotive.vehicle@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/biometrics/Android.bp b/func_fuzzer/biometrics/Android.bp
deleted file mode 100644
index 0ba1036..0000000
--- a/func_fuzzer/biometrics/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "fingerprint/V2_1",
-]

diff --git a/func_fuzzer/biometrics/fingerprint/V2_1/Android.bp b/func_fuzzer/biometrics/fingerprint/V2_1/Android.bp
deleted file mode 100644
index b4e91fc..0000000
--- a/func_fuzzer/biometrics/fingerprint/V2_1/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.biometrics.fingerprint@2.1-vts.func_fuzzer.BiometricsFingerprint_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
-    srcs: [
-        ":android.hardware.biometrics.fingerprint@2.1_hal",
-    ],
-    out: [
-        "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprint.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.biometrics.fingerprint@2.1-vts.func_fuzzer.BiometricsFingerprint",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.biometrics.fingerprint@2.1-vts.func_fuzzer.BiometricsFingerprint_genc++"],
-    shared_libs: [
-        "android.hardware.biometrics.fingerprint@2.1",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/bluetooth/Android.bp b/func_fuzzer/bluetooth/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/bluetooth/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/bluetooth/V1_0/Android.bp b/func_fuzzer/bluetooth/V1_0/Android.bp
deleted file mode 100644
index 6a627d5..0000000
--- a/func_fuzzer/bluetooth/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.bluetooth@1.0-vts.func_fuzzer.BluetoothHci_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
-    srcs: [
-        ":android.hardware.bluetooth@1.0_hal",
-    ],
-    out: [
-        "android/hardware/bluetooth/1.0/BluetoothHci.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.bluetooth@1.0-vts.func_fuzzer.BluetoothHci",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.bluetooth@1.0-vts.func_fuzzer.BluetoothHci_genc++"],
-    shared_libs: [
-        "android.hardware.bluetooth@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.bluetooth@1.0-vts.func_fuzzer.BluetoothHciCallbacks_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
-    srcs: [
-        ":android.hardware.bluetooth@1.0_hal",
-    ],
-    out: [
-        "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.bluetooth@1.0-vts.func_fuzzer.BluetoothHciCallbacks",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.bluetooth@1.0-vts.func_fuzzer.BluetoothHciCallbacks_genc++"],
-    shared_libs: [
-        "android.hardware.bluetooth@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/boot/Android.bp b/func_fuzzer/boot/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/boot/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/boot/V1_0/Android.bp b/func_fuzzer/boot/V1_0/Android.bp
deleted file mode 100644
index 2c9a440..0000000
--- a/func_fuzzer/boot/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.boot@1.0-vts.func_fuzzer.BootControl_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
-    srcs: [
-        ":android.hardware.boot@1.0_hal",
-    ],
-    out: [
-        "android/hardware/boot/1.0/BootControl.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.boot@1.0-vts.func_fuzzer.BootControl",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.boot@1.0-vts.func_fuzzer.BootControl_genc++"],
-    shared_libs: [
-        "android.hardware.boot@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/broadcastradio/Android.bp b/func_fuzzer/broadcastradio/Android.bp
deleted file mode 100644
index d2ed1d4..0000000
--- a/func_fuzzer/broadcastradio/Android.bp
+++ /dev/null

@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-    "V1_1",
-]

diff --git a/func_fuzzer/broadcastradio/V1_0/Android.bp b/func_fuzzer/broadcastradio/V1_0/Android.bp
deleted file mode 100644
index cf8e3d9..0000000
--- a/func_fuzzer/broadcastradio/V1_0/Android.bp
+++ /dev/null

@@ -1,101 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.broadcastradio@1.0-vts.func_fuzzer.BroadcastRadio_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
-    srcs: [
-        ":android.hardware.broadcastradio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/broadcastradio/1.0/BroadcastRadio.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.broadcastradio@1.0-vts.func_fuzzer.BroadcastRadio",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.broadcastradio@1.0-vts.func_fuzzer.BroadcastRadio_genc++"],
-    shared_libs: [
-        "android.hardware.broadcastradio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.broadcastradio@1.0-vts.func_fuzzer.BroadcastRadioFactory_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
-    srcs: [
-        ":android.hardware.broadcastradio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/broadcastradio/1.0/BroadcastRadioFactory.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.broadcastradio@1.0-vts.func_fuzzer.BroadcastRadioFactory",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.broadcastradio@1.0-vts.func_fuzzer.BroadcastRadioFactory_genc++"],
-    shared_libs: [
-        "android.hardware.broadcastradio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.broadcastradio@1.0-vts.func_fuzzer.Tuner_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
-    srcs: [
-        ":android.hardware.broadcastradio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/broadcastradio/1.0/Tuner.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.broadcastradio@1.0-vts.func_fuzzer.Tuner",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.broadcastradio@1.0-vts.func_fuzzer.Tuner_genc++"],
-    shared_libs: [
-        "android.hardware.broadcastradio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/broadcastradio/V1_1/Android.bp b/func_fuzzer/broadcastradio/V1_1/Android.bp
deleted file mode 100644
index 55e013b..0000000
--- a/func_fuzzer/broadcastradio/V1_1/Android.bp
+++ /dev/null

@@ -1,101 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.broadcastradio@1.1-vts.func_fuzzer.BroadcastRadio_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
-    srcs: [
-        ":android.hardware.broadcastradio@1.1_hal",
-    ],
-    out: [
-        "android/hardware/broadcastradio/1.1/BroadcastRadio.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.broadcastradio@1.1-vts.func_fuzzer.BroadcastRadio",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.broadcastradio@1.1-vts.func_fuzzer.BroadcastRadio_genc++"],
-    shared_libs: [
-        "android.hardware.broadcastradio@1.1",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.broadcastradio@1.1-vts.func_fuzzer.BroadcastRadioFactory_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
-    srcs: [
-        ":android.hardware.broadcastradio@1.1_hal",
-    ],
-    out: [
-        "android/hardware/broadcastradio/1.1/BroadcastRadioFactory.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.broadcastradio@1.1-vts.func_fuzzer.BroadcastRadioFactory",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.broadcastradio@1.1-vts.func_fuzzer.BroadcastRadioFactory_genc++"],
-    shared_libs: [
-        "android.hardware.broadcastradio@1.1",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.broadcastradio@1.1-vts.func_fuzzer.Tuner_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
-    srcs: [
-        ":android.hardware.broadcastradio@1.1_hal",
-    ],
-    out: [
-        "android/hardware/broadcastradio/1.1/Tuner.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.broadcastradio@1.1-vts.func_fuzzer.Tuner",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.broadcastradio@1.1-vts.func_fuzzer.Tuner_genc++"],
-    shared_libs: [
-        "android.hardware.broadcastradio@1.1",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/camera/Android.bp b/func_fuzzer/camera/Android.bp
deleted file mode 100644
index 22435ce..0000000
--- a/func_fuzzer/camera/Android.bp
+++ /dev/null

@@ -1,9 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "common/V1_0",
-    "device/V1_0",
-    "device/V3_2",
-    "metadata/V3_2",
-    "provider/V2_4",
-]

diff --git a/func_fuzzer/camera/common/V1_0/Android.bp b/func_fuzzer/camera/common/V1_0/Android.bp
deleted file mode 100644
index 61bf858..0000000
--- a/func_fuzzer/camera/common/V1_0/Android.bp
+++ /dev/null

@@ -1,2 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.

diff --git a/func_fuzzer/camera/device/V1_0/Android.bp b/func_fuzzer/camera/device/V1_0/Android.bp
deleted file mode 100644
index 2696e08..0000000
--- a/func_fuzzer/camera/device/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.camera.device@1.0-vts.func_fuzzer.CameraDevice_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
-    srcs: [
-        ":android.hardware.camera.device@1.0_hal",
-    ],
-    out: [
-        "android/hardware/camera/device/1.0/CameraDevice.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.camera.device@1.0-vts.func_fuzzer.CameraDevice",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.camera.device@1.0-vts.func_fuzzer.CameraDevice_genc++"],
-    shared_libs: [
-        "android.hardware.camera.device@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/camera/device/V3_2/Android.bp b/func_fuzzer/camera/device/V3_2/Android.bp
deleted file mode 100644
index 3a34593..0000000
--- a/func_fuzzer/camera/device/V3_2/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.camera.device@3.2-vts.func_fuzzer.CameraDevice_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
-    srcs: [
-        ":android.hardware.camera.device@3.2_hal",
-    ],
-    out: [
-        "android/hardware/camera/device/3.2/CameraDevice.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.camera.device@3.2-vts.func_fuzzer.CameraDevice",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.camera.device@3.2-vts.func_fuzzer.CameraDevice_genc++"],
-    shared_libs: [
-        "android.hardware.camera.device@3.2",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.camera.device@3.2-vts.func_fuzzer.CameraDeviceSession_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
-    srcs: [
-        ":android.hardware.camera.device@3.2_hal",
-    ],
-    out: [
-        "android/hardware/camera/device/3.2/CameraDeviceSession.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.camera.device@3.2-vts.func_fuzzer.CameraDeviceSession",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.camera.device@3.2-vts.func_fuzzer.CameraDeviceSession_genc++"],
-    shared_libs: [
-        "android.hardware.camera.device@3.2",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/camera/metadata/V3_2/Android.bp b/func_fuzzer/camera/metadata/V3_2/Android.bp
deleted file mode 100644
index 61bf858..0000000
--- a/func_fuzzer/camera/metadata/V3_2/Android.bp
+++ /dev/null

@@ -1,2 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.

diff --git a/func_fuzzer/camera/provider/V2_4/Android.bp b/func_fuzzer/camera/provider/V2_4/Android.bp
deleted file mode 100644
index c30e7cb..0000000
--- a/func_fuzzer/camera/provider/V2_4/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.camera.provider@2.4-vts.func_fuzzer.CameraProvider_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
-    srcs: [
-        ":android.hardware.camera.provider@2.4_hal",
-    ],
-    out: [
-        "android/hardware/camera/provider/2.4/CameraProvider.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.camera.provider@2.4-vts.func_fuzzer.CameraProvider",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.camera.provider@2.4-vts.func_fuzzer.CameraProvider_genc++"],
-    shared_libs: [
-        "android.hardware.camera.provider@2.4",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/configstore/Android.bp b/func_fuzzer/configstore/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/configstore/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/configstore/V1_0/Android.bp b/func_fuzzer/configstore/V1_0/Android.bp
deleted file mode 100644
index fea024f..0000000
--- a/func_fuzzer/configstore/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.configstore@1.0-vts.func_fuzzer.SurfaceFlingerConfigs_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
-    srcs: [
-        ":android.hardware.configstore@1.0_hal",
-    ],
-    out: [
-        "android/hardware/configstore/1.0/SurfaceFlingerConfigs.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.configstore@1.0-vts.func_fuzzer.SurfaceFlingerConfigs",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.configstore@1.0-vts.func_fuzzer.SurfaceFlingerConfigs_genc++"],
-    shared_libs: [
-        "android.hardware.configstore@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/contexthub/Android.bp b/func_fuzzer/contexthub/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/contexthub/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/contexthub/V1_0/Android.bp b/func_fuzzer/contexthub/V1_0/Android.bp
deleted file mode 100644
index 38b7ee1..0000000
--- a/func_fuzzer/contexthub/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.contexthub@1.0-vts.func_fuzzer.Contexthub_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
-    srcs: [
-        ":android.hardware.contexthub@1.0_hal",
-    ],
-    out: [
-        "android/hardware/contexthub/1.0/Contexthub.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.contexthub@1.0-vts.func_fuzzer.Contexthub",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.contexthub@1.0-vts.func_fuzzer.Contexthub_genc++"],
-    shared_libs: [
-        "android.hardware.contexthub@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/drm/Android.bp b/func_fuzzer/drm/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/drm/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/drm/V1_0/Android.bp b/func_fuzzer/drm/V1_0/Android.bp
deleted file mode 100644
index 5a7b3aa..0000000
--- a/func_fuzzer/drm/V1_0/Android.bp
+++ /dev/null

@@ -1,167 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.CryptoFactory_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
-    srcs: [
-        ":android.hardware.drm@1.0_hal",
-    ],
-    out: [
-        "android/hardware/drm/1.0/CryptoFactory.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.CryptoFactory",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.drm@1.0-vts.func_fuzzer.CryptoFactory_genc++"],
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.CryptoPlugin_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
-    srcs: [
-        ":android.hardware.drm@1.0_hal",
-    ],
-    out: [
-        "android/hardware/drm/1.0/CryptoPlugin.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.CryptoPlugin",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.drm@1.0-vts.func_fuzzer.CryptoPlugin_genc++"],
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.DrmFactory_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
-    srcs: [
-        ":android.hardware.drm@1.0_hal",
-    ],
-    out: [
-        "android/hardware/drm/1.0/DrmFactory.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.DrmFactory",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.drm@1.0-vts.func_fuzzer.DrmFactory_genc++"],
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.DrmPlugin_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
-    srcs: [
-        ":android.hardware.drm@1.0_hal",
-    ],
-    out: [
-        "android/hardware/drm/1.0/DrmPlugin.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.DrmPlugin",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.drm@1.0-vts.func_fuzzer.DrmPlugin_genc++"],
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.DrmPluginListener_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
-    srcs: [
-        ":android.hardware.drm@1.0_hal",
-    ],
-    out: [
-        "android/hardware/drm/1.0/DrmPluginListener.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.drm@1.0-vts.func_fuzzer.DrmPluginListener",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.drm@1.0-vts.func_fuzzer.DrmPluginListener_genc++"],
-    shared_libs: [
-        "android.hardware.drm@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/dumpstate/Android.bp b/func_fuzzer/dumpstate/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/dumpstate/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/dumpstate/V1_0/Android.bp b/func_fuzzer/dumpstate/V1_0/Android.bp
deleted file mode 100644
index 0d56b35..0000000
--- a/func_fuzzer/dumpstate/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.dumpstate@1.0-vts.func_fuzzer.DumpstateDevice_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
-    srcs: [
-        ":android.hardware.dumpstate@1.0_hal",
-    ],
-    out: [
-        "android/hardware/dumpstate/1.0/DumpstateDevice.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.dumpstate@1.0-vts.func_fuzzer.DumpstateDevice",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.dumpstate@1.0-vts.func_fuzzer.DumpstateDevice_genc++"],
-    shared_libs: [
-        "android.hardware.dumpstate@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/gatekeeper/Android.bp b/func_fuzzer/gatekeeper/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/gatekeeper/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/gatekeeper/V1_0/Android.bp b/func_fuzzer/gatekeeper/V1_0/Android.bp
deleted file mode 100644
index 961a76f..0000000
--- a/func_fuzzer/gatekeeper/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.gatekeeper@1.0-vts.func_fuzzer.Gatekeeper_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
-    srcs: [
-        ":android.hardware.gatekeeper@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gatekeeper/1.0/Gatekeeper.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gatekeeper@1.0-vts.func_fuzzer.Gatekeeper",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gatekeeper@1.0-vts.func_fuzzer.Gatekeeper_genc++"],
-    shared_libs: [
-        "android.hardware.gatekeeper@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/gnss/Android.bp b/func_fuzzer/gnss/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/gnss/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/gnss/V1_0/Android.bp b/func_fuzzer/gnss/V1_0/Android.bp
deleted file mode 100644
index b7c4a40..0000000
--- a/func_fuzzer/gnss/V1_0/Android.bp
+++ /dev/null

@@ -1,365 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.AGnss_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/AGnss.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.AGnss",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.AGnss_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.AGnssRil_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/AGnssRil.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.AGnssRil",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.AGnssRil_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.Gnss_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/Gnss.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.Gnss",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.Gnss_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssBatching_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssBatching.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssBatching",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssBatching_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssConfiguration_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssConfiguration.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssConfiguration",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssConfiguration_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssDebug_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssDebug.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssDebug",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssDebug_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssGeofencing_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssGeofencing.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssGeofencing",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssGeofencing_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssMeasurement_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssMeasurement.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssMeasurement",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssMeasurement_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssNavigationMessage_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssNavigationMessage.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssNavigationMessage",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssNavigationMessage_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssNi_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssNi.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssNi",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssNi_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssXtra_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
-    srcs: [
-        ":android.hardware.gnss@1.0_hal",
-    ],
-    out: [
-        "android/hardware/gnss/1.0/GnssXtra.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.gnss@1.0-vts.func_fuzzer.GnssXtra",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.gnss@1.0-vts.func_fuzzer.GnssXtra_genc++"],
-    shared_libs: [
-        "android.hardware.gnss@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/graphics/Android.bp b/func_fuzzer/graphics/Android.bp
deleted file mode 100644
index c9a00eb..0000000
--- a/func_fuzzer/graphics/Android.bp
+++ /dev/null

@@ -1,9 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "allocator/V2_0",
-    "bufferqueue/V1_0",
-    "common/V1_0",
-    "composer/V2_1",
-    "mapper/V2_0",
-]

diff --git a/func_fuzzer/graphics/allocator/V2_0/Android.bp b/func_fuzzer/graphics/allocator/V2_0/Android.bp
deleted file mode 100644
index bcb21a9..0000000
--- a/func_fuzzer/graphics/allocator/V2_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.graphics.allocator@2.0-vts.func_fuzzer.Allocator_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
-    srcs: [
-        ":android.hardware.graphics.allocator@2.0_hal",
-    ],
-    out: [
-        "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.graphics.allocator@2.0-vts.func_fuzzer.Allocator",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.graphics.allocator@2.0-vts.func_fuzzer.Allocator_genc++"],
-    shared_libs: [
-        "android.hardware.graphics.allocator@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/graphics/bufferqueue/V1_0/Android.bp b/func_fuzzer/graphics/bufferqueue/V1_0/Android.bp
deleted file mode 100644
index a9bbbcb..0000000
--- a/func_fuzzer/graphics/bufferqueue/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.graphics.bufferqueue@1.0-vts.func_fuzzer.GraphicBufferProducer_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
-    srcs: [
-        ":android.hardware.graphics.bufferqueue@1.0_hal",
-    ],
-    out: [
-        "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducer.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.graphics.bufferqueue@1.0-vts.func_fuzzer.GraphicBufferProducer",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.graphics.bufferqueue@1.0-vts.func_fuzzer.GraphicBufferProducer_genc++"],
-    shared_libs: [
-        "android.hardware.graphics.bufferqueue@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.graphics.bufferqueue@1.0-vts.func_fuzzer.ProducerListener_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
-    srcs: [
-        ":android.hardware.graphics.bufferqueue@1.0_hal",
-    ],
-    out: [
-        "android/hardware/graphics/bufferqueue/1.0/ProducerListener.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.graphics.bufferqueue@1.0-vts.func_fuzzer.ProducerListener",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.graphics.bufferqueue@1.0-vts.func_fuzzer.ProducerListener_genc++"],
-    shared_libs: [
-        "android.hardware.graphics.bufferqueue@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/graphics/common/V1_0/Android.bp b/func_fuzzer/graphics/common/V1_0/Android.bp
deleted file mode 100644
index 61bf858..0000000
--- a/func_fuzzer/graphics/common/V1_0/Android.bp
+++ /dev/null

@@ -1,2 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.

diff --git a/func_fuzzer/graphics/composer/V2_1/Android.bp b/func_fuzzer/graphics/composer/V2_1/Android.bp
deleted file mode 100644
index 621a48d..0000000
--- a/func_fuzzer/graphics/composer/V2_1/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.graphics.composer@2.1-vts.func_fuzzer.Composer_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
-    srcs: [
-        ":android.hardware.graphics.composer@2.1_hal",
-    ],
-    out: [
-        "android/hardware/graphics/composer/2.1/Composer.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.graphics.composer@2.1-vts.func_fuzzer.Composer",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.graphics.composer@2.1-vts.func_fuzzer.Composer_genc++"],
-    shared_libs: [
-        "android.hardware.graphics.composer@2.1",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.graphics.composer@2.1-vts.func_fuzzer.ComposerClient_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
-    srcs: [
-        ":android.hardware.graphics.composer@2.1_hal",
-    ],
-    out: [
-        "android/hardware/graphics/composer/2.1/ComposerClient.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.graphics.composer@2.1-vts.func_fuzzer.ComposerClient",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.graphics.composer@2.1-vts.func_fuzzer.ComposerClient_genc++"],
-    shared_libs: [
-        "android.hardware.graphics.composer@2.1",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/graphics/mapper/V2_0/Android.bp b/func_fuzzer/graphics/mapper/V2_0/Android.bp
deleted file mode 100644
index d816765..0000000
--- a/func_fuzzer/graphics/mapper/V2_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.graphics.mapper@2.0-vts.func_fuzzer.Mapper_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
-    srcs: [
-        ":android.hardware.graphics.mapper@2.0_hal",
-    ],
-    out: [
-        "android/hardware/graphics/mapper/2.0/Mapper.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.graphics.mapper@2.0-vts.func_fuzzer.Mapper",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.graphics.mapper@2.0-vts.func_fuzzer.Mapper_genc++"],
-    shared_libs: [
-        "android.hardware.graphics.mapper@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/health/Android.bp b/func_fuzzer/health/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/health/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/health/V1_0/Android.bp b/func_fuzzer/health/V1_0/Android.bp
deleted file mode 100644
index 94448a4..0000000
--- a/func_fuzzer/health/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.health@1.0-vts.func_fuzzer.Health_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
-    srcs: [
-        ":android.hardware.health@1.0_hal",
-    ],
-    out: [
-        "android/hardware/health/1.0/Health.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.health@1.0-vts.func_fuzzer.Health",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.health@1.0-vts.func_fuzzer.Health_genc++"],
-    shared_libs: [
-        "android.hardware.health@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/ir/Android.bp b/func_fuzzer/ir/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/ir/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/ir/V1_0/Android.bp b/func_fuzzer/ir/V1_0/Android.bp
deleted file mode 100644
index 82ffd28..0000000
--- a/func_fuzzer/ir/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.ir@1.0-vts.func_fuzzer.ConsumerIr_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
-    srcs: [
-        ":android.hardware.ir@1.0_hal",
-    ],
-    out: [
-        "android/hardware/ir/1.0/ConsumerIr.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.ir@1.0-vts.func_fuzzer.ConsumerIr",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.ir@1.0-vts.func_fuzzer.ConsumerIr_genc++"],
-    shared_libs: [
-        "android.hardware.ir@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/keymaster/Android.bp b/func_fuzzer/keymaster/Android.bp
deleted file mode 100644
index 5e6c8db..0000000
--- a/func_fuzzer/keymaster/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V3_0",
-]

diff --git a/func_fuzzer/keymaster/V3_0/Android.bp b/func_fuzzer/keymaster/V3_0/Android.bp
deleted file mode 100644
index 51dd19f..0000000
--- a/func_fuzzer/keymaster/V3_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.keymaster@3.0-vts.func_fuzzer.KeymasterDevice_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
-    srcs: [
-        ":android.hardware.keymaster@3.0_hal",
-    ],
-    out: [
-        "android/hardware/keymaster/3.0/KeymasterDevice.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.keymaster@3.0-vts.func_fuzzer.KeymasterDevice",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.keymaster@3.0-vts.func_fuzzer.KeymasterDevice_genc++"],
-    shared_libs: [
-        "android.hardware.keymaster@3.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/light/Android.bp b/func_fuzzer/light/Android.bp
deleted file mode 100644
index b55494f..0000000
--- a/func_fuzzer/light/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V2_0",
-]

diff --git a/func_fuzzer/light/V2_0/Android.bp b/func_fuzzer/light/V2_0/Android.bp
deleted file mode 100644
index 51daad2..0000000
--- a/func_fuzzer/light/V2_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.light@2.0-vts.func_fuzzer.Light_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
-    srcs: [
-        ":android.hardware.light@2.0_hal",
-    ],
-    out: [
-        "android/hardware/light/2.0/Light.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.light@2.0-vts.func_fuzzer.Light",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.light@2.0-vts.func_fuzzer.Light_genc++"],
-    shared_libs: [
-        "android.hardware.light@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/media/Android.bp b/func_fuzzer/media/Android.bp
deleted file mode 100644
index 83bf727..0000000
--- a/func_fuzzer/media/Android.bp
+++ /dev/null

@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-    "omx/V1_0",
-]

diff --git a/func_fuzzer/media/V1_0/Android.bp b/func_fuzzer/media/V1_0/Android.bp
deleted file mode 100644
index 61bf858..0000000
--- a/func_fuzzer/media/V1_0/Android.bp
+++ /dev/null

@@ -1,2 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.

diff --git a/func_fuzzer/media/omx/V1_0/Android.bp b/func_fuzzer/media/omx/V1_0/Android.bp
deleted file mode 100644
index 5232fec..0000000
--- a/func_fuzzer/media/omx/V1_0/Android.bp
+++ /dev/null

@@ -1,200 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.GraphicBufferSource_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
-    srcs: [
-        ":android.hardware.media.omx@1.0_hal",
-    ],
-    out: [
-        "android/hardware/media/omx/1.0/GraphicBufferSource.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.GraphicBufferSource",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.GraphicBufferSource_genc++"],
-    shared_libs: [
-        "android.hardware.media.omx@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.Omx_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
-    srcs: [
-        ":android.hardware.media.omx@1.0_hal",
-    ],
-    out: [
-        "android/hardware/media/omx/1.0/Omx.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.Omx",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.Omx_genc++"],
-    shared_libs: [
-        "android.hardware.media.omx@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxBufferSource_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
-    srcs: [
-        ":android.hardware.media.omx@1.0_hal",
-    ],
-    out: [
-        "android/hardware/media/omx/1.0/OmxBufferSource.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxBufferSource",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.OmxBufferSource_genc++"],
-    shared_libs: [
-        "android.hardware.media.omx@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxNode_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
-    srcs: [
-        ":android.hardware.media.omx@1.0_hal",
-    ],
-    out: [
-        "android/hardware/media/omx/1.0/OmxNode.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxNode",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.OmxNode_genc++"],
-    shared_libs: [
-        "android.hardware.media.omx@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxObserver_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
-    srcs: [
-        ":android.hardware.media.omx@1.0_hal",
-    ],
-    out: [
-        "android/hardware/media/omx/1.0/OmxObserver.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxObserver",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.OmxObserver_genc++"],
-    shared_libs: [
-        "android.hardware.media.omx@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxStore_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
-    srcs: [
-        ":android.hardware.media.omx@1.0_hal",
-    ],
-    out: [
-        "android/hardware/media/omx/1.0/OmxStore.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxStore",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.OmxStore_genc++"],
-    shared_libs: [
-        "android.hardware.media.omx@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/memtrack/Android.bp b/func_fuzzer/memtrack/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/memtrack/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/memtrack/V1_0/Android.bp b/func_fuzzer/memtrack/V1_0/Android.bp
deleted file mode 100644
index 8cc2252..0000000
--- a/func_fuzzer/memtrack/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.memtrack@1.0-vts.func_fuzzer.Memtrack_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
-    srcs: [
-        ":android.hardware.memtrack@1.0_hal",
-    ],
-    out: [
-        "android/hardware/memtrack/1.0/Memtrack.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.memtrack@1.0-vts.func_fuzzer.Memtrack",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.memtrack@1.0-vts.func_fuzzer.Memtrack_genc++"],
-    shared_libs: [
-        "android.hardware.memtrack@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/nfc/Android.bp b/func_fuzzer/nfc/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/nfc/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/nfc/V1_0/Android.bp b/func_fuzzer/nfc/V1_0/Android.bp
deleted file mode 100644
index abfde9f..0000000
--- a/func_fuzzer/nfc/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.nfc@1.0-vts.func_fuzzer.Nfc_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
-    srcs: [
-        ":android.hardware.nfc@1.0_hal",
-    ],
-    out: [
-        "android/hardware/nfc/1.0/Nfc.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.nfc@1.0-vts.func_fuzzer.Nfc",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.nfc@1.0-vts.func_fuzzer.Nfc_genc++"],
-    shared_libs: [
-        "android.hardware.nfc@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/power/Android.bp b/func_fuzzer/power/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/power/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/power/V1_0/Android.bp b/func_fuzzer/power/V1_0/Android.bp
deleted file mode 100644
index 2184e8a..0000000
--- a/func_fuzzer/power/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.power@1.0-vts.func_fuzzer.Power_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
-    srcs: [
-        ":android.hardware.power@1.0_hal",
-    ],
-    out: [
-        "android/hardware/power/1.0/Power.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.power@1.0-vts.func_fuzzer.Power",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.power@1.0-vts.func_fuzzer.Power_genc++"],
-    shared_libs: [
-        "android.hardware.power@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/radio/Android.bp b/func_fuzzer/radio/Android.bp
deleted file mode 100644
index 75e90ed..0000000
--- a/func_fuzzer/radio/Android.bp
+++ /dev/null

@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-    "deprecated/V1_0",
-]

diff --git a/func_fuzzer/radio/V1_0/Android.bp b/func_fuzzer/radio/V1_0/Android.bp
deleted file mode 100644
index 3b348ee..0000000
--- a/func_fuzzer/radio/V1_0/Android.bp
+++ /dev/null

@@ -1,134 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.Radio_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
-    srcs: [
-        ":android.hardware.radio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/1.0/Radio.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.Radio",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio@1.0-vts.func_fuzzer.Radio_genc++"],
-    shared_libs: [
-        "android.hardware.radio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.RadioIndication_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
-    srcs: [
-        ":android.hardware.radio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/1.0/RadioIndication.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.RadioIndication",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio@1.0-vts.func_fuzzer.RadioIndication_genc++"],
-    shared_libs: [
-        "android.hardware.radio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.RadioResponse_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
-    srcs: [
-        ":android.hardware.radio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/1.0/RadioResponse.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.RadioResponse",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio@1.0-vts.func_fuzzer.RadioResponse_genc++"],
-    shared_libs: [
-        "android.hardware.radio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.Sap_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
-    srcs: [
-        ":android.hardware.radio@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/1.0/Sap.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio@1.0-vts.func_fuzzer.Sap",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio@1.0-vts.func_fuzzer.Sap_genc++"],
-    shared_libs: [
-        "android.hardware.radio@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/radio/deprecated/V1_0/Android.bp b/func_fuzzer/radio/deprecated/V1_0/Android.bp
deleted file mode 100644
index 837500b..0000000
--- a/func_fuzzer/radio/deprecated/V1_0/Android.bp
+++ /dev/null

@@ -1,101 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHook_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
-    srcs: [
-        ":android.hardware.radio.deprecated@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/deprecated/1.0/OemHook.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHook",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHook_genc++"],
-    shared_libs: [
-        "android.hardware.radio.deprecated@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHookIndication_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
-    srcs: [
-        ":android.hardware.radio.deprecated@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/deprecated/1.0/OemHookIndication.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHookIndication",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHookIndication_genc++"],
-    shared_libs: [
-        "android.hardware.radio.deprecated@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHookResponse_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
-    srcs: [
-        ":android.hardware.radio.deprecated@1.0_hal",
-    ],
-    out: [
-        "android/hardware/radio/deprecated/1.0/OemHookResponse.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHookResponse",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.radio.deprecated@1.0-vts.func_fuzzer.OemHookResponse_genc++"],
-    shared_libs: [
-        "android.hardware.radio.deprecated@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/renderscript/Android.bp b/func_fuzzer/renderscript/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/renderscript/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/renderscript/V1_0/Android.bp b/func_fuzzer/renderscript/V1_0/Android.bp
deleted file mode 100644
index c98367d..0000000
--- a/func_fuzzer/renderscript/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.renderscript@1.0-vts.func_fuzzer.Context_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
-    srcs: [
-        ":android.hardware.renderscript@1.0_hal",
-    ],
-    out: [
-        "android/hardware/renderscript/1.0/Context.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.renderscript@1.0-vts.func_fuzzer.Context",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.renderscript@1.0-vts.func_fuzzer.Context_genc++"],
-    shared_libs: [
-        "android.hardware.renderscript@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.renderscript@1.0-vts.func_fuzzer.Device_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
-    srcs: [
-        ":android.hardware.renderscript@1.0_hal",
-    ],
-    out: [
-        "android/hardware/renderscript/1.0/Device.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.renderscript@1.0-vts.func_fuzzer.Device",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.renderscript@1.0-vts.func_fuzzer.Device_genc++"],
-    shared_libs: [
-        "android.hardware.renderscript@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/sensors/Android.bp b/func_fuzzer/sensors/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/sensors/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/sensors/V1_0/Android.bp b/func_fuzzer/sensors/V1_0/Android.bp
deleted file mode 100644
index 0aa26e8..0000000
--- a/func_fuzzer/sensors/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.sensors@1.0-vts.func_fuzzer.Sensors_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
-    srcs: [
-        ":android.hardware.sensors@1.0_hal",
-    ],
-    out: [
-        "android/hardware/sensors/1.0/Sensors.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.sensors@1.0-vts.func_fuzzer.Sensors",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.sensors@1.0-vts.func_fuzzer.Sensors_genc++"],
-    shared_libs: [
-        "android.hardware.sensors@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/soundtrigger/Android.bp b/func_fuzzer/soundtrigger/Android.bp
deleted file mode 100644
index b55494f..0000000
--- a/func_fuzzer/soundtrigger/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V2_0",
-]

diff --git a/func_fuzzer/soundtrigger/V2_0/Android.bp b/func_fuzzer/soundtrigger/V2_0/Android.bp
deleted file mode 100644
index ae1faf6..0000000
--- a/func_fuzzer/soundtrigger/V2_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.soundtrigger@2.0-vts.func_fuzzer.SoundTriggerHw_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
-    srcs: [
-        ":android.hardware.soundtrigger@2.0_hal",
-    ],
-    out: [
-        "android/hardware/soundtrigger/2.0/SoundTriggerHw.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.soundtrigger@2.0-vts.func_fuzzer.SoundTriggerHw",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.soundtrigger@2.0-vts.func_fuzzer.SoundTriggerHw_genc++"],
-    shared_libs: [
-        "android.hardware.soundtrigger@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/Android.bp b/func_fuzzer/tests/Android.bp
deleted file mode 100644
index fc9b2a3..0000000
--- a/func_fuzzer/tests/Android.bp
+++ /dev/null

@@ -1,15 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "bar/V1_0",
-    "baz/V1_0",
-    "expression/V1_0",
-    "extension/light/V2_0",
-    "foo/V1_0",
-    "hash/V1_0",
-    "inheritance/V1_0",
-    "libhwbinder/V1_0",
-    "memory/V1_0",
-    "msgq/V1_0",
-    "pointer/V1_0",
-]

diff --git a/func_fuzzer/tests/bar/V1_0/Android.bp b/func_fuzzer/tests/bar/V1_0/Android.bp
deleted file mode 100644
index 526bdbe..0000000
--- a/func_fuzzer/tests/bar/V1_0/Android.bp
+++ /dev/null

@@ -1,134 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.Bar_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
-    srcs: [
-        ":android.hardware.tests.bar@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/bar/1.0/Bar.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.Bar",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.bar@1.0-vts.func_fuzzer.Bar_genc++"],
-    shared_libs: [
-        "android.hardware.tests.bar@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.Complicated_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
-    srcs: [
-        ":android.hardware.tests.bar@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/bar/1.0/Complicated.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.Complicated",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.bar@1.0-vts.func_fuzzer.Complicated_genc++"],
-    shared_libs: [
-        "android.hardware.tests.bar@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.ImportRules_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
-    srcs: [
-        ":android.hardware.tests.bar@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/bar/1.0/ImportRules.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.ImportRules",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.bar@1.0-vts.func_fuzzer.ImportRules_genc++"],
-    shared_libs: [
-        "android.hardware.tests.bar@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.ImportTypes_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
-    srcs: [
-        ":android.hardware.tests.bar@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/bar/1.0/ImportTypes.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.bar@1.0-vts.func_fuzzer.ImportTypes",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.bar@1.0-vts.func_fuzzer.ImportTypes_genc++"],
-    shared_libs: [
-        "android.hardware.tests.bar@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/baz/V1_0/Android.bp b/func_fuzzer/tests/baz/V1_0/Android.bp
deleted file mode 100644
index 061ac45..0000000
--- a/func_fuzzer/tests/baz/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.baz@1.0-vts.func_fuzzer.Base_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
-    srcs: [
-        ":android.hardware.tests.baz@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/baz/1.0/Base.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.baz@1.0-vts.func_fuzzer.Base",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.baz@1.0-vts.func_fuzzer.Base_genc++"],
-    shared_libs: [
-        "android.hardware.tests.baz@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.baz@1.0-vts.func_fuzzer.Baz_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
-    srcs: [
-        ":android.hardware.tests.baz@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/baz/1.0/Baz.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.baz@1.0-vts.func_fuzzer.Baz",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.baz@1.0-vts.func_fuzzer.Baz_genc++"],
-    shared_libs: [
-        "android.hardware.tests.baz@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/expression/V1_0/Android.bp b/func_fuzzer/tests/expression/V1_0/Android.bp
deleted file mode 100644
index 3ad256b..0000000
--- a/func_fuzzer/tests/expression/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.expression@1.0-vts.func_fuzzer.Expression_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
-    srcs: [
-        ":android.hardware.tests.expression@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/expression/1.0/Expression.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.expression@1.0-vts.func_fuzzer.Expression",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.expression@1.0-vts.func_fuzzer.Expression_genc++"],
-    shared_libs: [
-        "android.hardware.tests.expression@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.expression@1.0-vts.func_fuzzer.ExpressionExt_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
-    srcs: [
-        ":android.hardware.tests.expression@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/expression/1.0/ExpressionExt.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.expression@1.0-vts.func_fuzzer.ExpressionExt",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.expression@1.0-vts.func_fuzzer.ExpressionExt_genc++"],
-    shared_libs: [
-        "android.hardware.tests.expression@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/extension/light/V2_0/Android.bp b/func_fuzzer/tests/extension/light/V2_0/Android.bp
deleted file mode 100644
index b68dbf9..0000000
--- a/func_fuzzer/tests/extension/light/V2_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.extension.light@2.0-vts.func_fuzzer.ExtLight_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
-    srcs: [
-        ":android.hardware.tests.extension.light@2.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/extension/light/2.0/ExtLight.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.extension.light@2.0-vts.func_fuzzer.ExtLight",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.extension.light@2.0-vts.func_fuzzer.ExtLight_genc++"],
-    shared_libs: [
-        "android.hardware.tests.extension.light@2.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/foo/V1_0/Android.bp b/func_fuzzer/tests/foo/V1_0/Android.bp
deleted file mode 100644
index 238dbc1..0000000
--- a/func_fuzzer/tests/foo/V1_0/Android.bp
+++ /dev/null

@@ -1,134 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.Foo_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
-    srcs: [
-        ":android.hardware.tests.foo@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/foo/1.0/Foo.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.Foo",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.foo@1.0-vts.func_fuzzer.Foo_genc++"],
-    shared_libs: [
-        "android.hardware.tests.foo@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.MyTypes_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
-    srcs: [
-        ":android.hardware.tests.foo@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/foo/1.0/MyTypes.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.MyTypes",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.foo@1.0-vts.func_fuzzer.MyTypes_genc++"],
-    shared_libs: [
-        "android.hardware.tests.foo@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.Simple_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
-    srcs: [
-        ":android.hardware.tests.foo@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/foo/1.0/Simple.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.Simple",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.foo@1.0-vts.func_fuzzer.Simple_genc++"],
-    shared_libs: [
-        "android.hardware.tests.foo@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.TheirTypes_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
-    srcs: [
-        ":android.hardware.tests.foo@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/foo/1.0/TheirTypes.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.foo@1.0-vts.func_fuzzer.TheirTypes",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.foo@1.0-vts.func_fuzzer.TheirTypes_genc++"],
-    shared_libs: [
-        "android.hardware.tests.foo@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/hash/V1_0/Android.bp b/func_fuzzer/tests/hash/V1_0/Android.bp
deleted file mode 100644
index 6c87c75..0000000
--- a/func_fuzzer/tests/hash/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.hash@1.0-vts.func_fuzzer.Hash_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
-    srcs: [
-        ":android.hardware.tests.hash@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/hash/1.0/Hash.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.hash@1.0-vts.func_fuzzer.Hash",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.hash@1.0-vts.func_fuzzer.Hash_genc++"],
-    shared_libs: [
-        "android.hardware.tests.hash@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/inheritance/V1_0/Android.bp b/func_fuzzer/tests/inheritance/V1_0/Android.bp
deleted file mode 100644
index 9bcfaae..0000000
--- a/func_fuzzer/tests/inheritance/V1_0/Android.bp
+++ /dev/null

@@ -1,134 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Child_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
-    srcs: [
-        ":android.hardware.tests.inheritance@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/inheritance/1.0/Child.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Child",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Child_genc++"],
-    shared_libs: [
-        "android.hardware.tests.inheritance@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Fetcher_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
-    srcs: [
-        ":android.hardware.tests.inheritance@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/inheritance/1.0/Fetcher.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Fetcher",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Fetcher_genc++"],
-    shared_libs: [
-        "android.hardware.tests.inheritance@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Grandparent_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
-    srcs: [
-        ":android.hardware.tests.inheritance@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/inheritance/1.0/Grandparent.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Grandparent",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Grandparent_genc++"],
-    shared_libs: [
-        "android.hardware.tests.inheritance@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Parent_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
-    srcs: [
-        ":android.hardware.tests.inheritance@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/inheritance/1.0/Parent.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Parent",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.inheritance@1.0-vts.func_fuzzer.Parent_genc++"],
-    shared_libs: [
-        "android.hardware.tests.inheritance@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/libhwbinder/V1_0/Android.bp b/func_fuzzer/tests/libhwbinder/V1_0/Android.bp
deleted file mode 100644
index 602ab03..0000000
--- a/func_fuzzer/tests/libhwbinder/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.libhwbinder@1.0-vts.func_fuzzer.Benchmark_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
-    srcs: [
-        ":android.hardware.tests.libhwbinder@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.libhwbinder@1.0-vts.func_fuzzer.Benchmark",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.libhwbinder@1.0-vts.func_fuzzer.Benchmark_genc++"],
-    shared_libs: [
-        "android.hardware.tests.libhwbinder@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/memory/V1_0/Android.bp b/func_fuzzer/tests/memory/V1_0/Android.bp
deleted file mode 100644
index 3b182e6..0000000
--- a/func_fuzzer/tests/memory/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.memory@1.0-vts.func_fuzzer.MemoryTest_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
-    srcs: [
-        ":android.hardware.tests.memory@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/memory/1.0/MemoryTest.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.memory@1.0-vts.func_fuzzer.MemoryTest",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.memory@1.0-vts.func_fuzzer.MemoryTest_genc++"],
-    shared_libs: [
-        "android.hardware.tests.memory@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/msgq/V1_0/Android.bp b/func_fuzzer/tests/msgq/V1_0/Android.bp
deleted file mode 100644
index b8d8c5f..0000000
--- a/func_fuzzer/tests/msgq/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.msgq@1.0-vts.func_fuzzer.BenchmarkMsgQ_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
-    srcs: [
-        ":android.hardware.tests.msgq@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/msgq/1.0/BenchmarkMsgQ.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.msgq@1.0-vts.func_fuzzer.BenchmarkMsgQ",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.msgq@1.0-vts.func_fuzzer.BenchmarkMsgQ_genc++"],
-    shared_libs: [
-        "android.hardware.tests.msgq@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.msgq@1.0-vts.func_fuzzer.TestMsgQ_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
-    srcs: [
-        ":android.hardware.tests.msgq@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/msgq/1.0/TestMsgQ.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.msgq@1.0-vts.func_fuzzer.TestMsgQ",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.msgq@1.0-vts.func_fuzzer.TestMsgQ_genc++"],
-    shared_libs: [
-        "android.hardware.tests.msgq@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tests/pointer/V1_0/Android.bp b/func_fuzzer/tests/pointer/V1_0/Android.bp
deleted file mode 100644
index 327fbaa..0000000
--- a/func_fuzzer/tests/pointer/V1_0/Android.bp
+++ /dev/null

@@ -1,68 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tests.pointer@1.0-vts.func_fuzzer.Graph_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
-    srcs: [
-        ":android.hardware.tests.pointer@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/pointer/1.0/Graph.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.pointer@1.0-vts.func_fuzzer.Graph",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.pointer@1.0-vts.func_fuzzer.Graph_genc++"],
-    shared_libs: [
-        "android.hardware.tests.pointer@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.tests.pointer@1.0-vts.func_fuzzer.Pointer_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
-    srcs: [
-        ":android.hardware.tests.pointer@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tests/pointer/1.0/Pointer.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tests.pointer@1.0-vts.func_fuzzer.Pointer",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tests.pointer@1.0-vts.func_fuzzer.Pointer_genc++"],
-    shared_libs: [
-        "android.hardware.tests.pointer@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/thermal/Android.bp b/func_fuzzer/thermal/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/thermal/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/thermal/V1_0/Android.bp b/func_fuzzer/thermal/V1_0/Android.bp
deleted file mode 100644
index 334a59e..0000000
--- a/func_fuzzer/thermal/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.thermal@1.0-vts.func_fuzzer.Thermal_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
-    srcs: [
-        ":android.hardware.thermal@1.0_hal",
-    ],
-    out: [
-        "android/hardware/thermal/1.0/Thermal.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.thermal@1.0-vts.func_fuzzer.Thermal",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.thermal@1.0-vts.func_fuzzer.Thermal_genc++"],
-    shared_libs: [
-        "android.hardware.thermal@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tv/Android.bp b/func_fuzzer/tv/Android.bp
deleted file mode 100644
index 5c11ad7..0000000
--- a/func_fuzzer/tv/Android.bp
+++ /dev/null

@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "cec/V1_0",
-    "input/V1_0",
-]

diff --git a/func_fuzzer/tv/cec/V1_0/Android.bp b/func_fuzzer/tv/cec/V1_0/Android.bp
deleted file mode 100644
index 3add9c4..0000000
--- a/func_fuzzer/tv/cec/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tv.cec@1.0-vts.func_fuzzer.HdmiCec_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
-    srcs: [
-        ":android.hardware.tv.cec@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tv/cec/1.0/HdmiCec.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tv.cec@1.0-vts.func_fuzzer.HdmiCec",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tv.cec@1.0-vts.func_fuzzer.HdmiCec_genc++"],
-    shared_libs: [
-        "android.hardware.tv.cec@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/tv/input/V1_0/Android.bp b/func_fuzzer/tv/input/V1_0/Android.bp
deleted file mode 100644
index e1dcccc..0000000
--- a/func_fuzzer/tv/input/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.tv.input@1.0-vts.func_fuzzer.TvInput_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
-    srcs: [
-        ":android.hardware.tv.input@1.0_hal",
-    ],
-    out: [
-        "android/hardware/tv/input/1.0/TvInput.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.tv.input@1.0-vts.func_fuzzer.TvInput",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.tv.input@1.0-vts.func_fuzzer.TvInput_genc++"],
-    shared_libs: [
-        "android.hardware.tv.input@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/usb/Android.bp b/func_fuzzer/usb/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/usb/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/usb/V1_0/Android.bp b/func_fuzzer/usb/V1_0/Android.bp
deleted file mode 100644
index 0765e6f..0000000
--- a/func_fuzzer/usb/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.usb@1.0-vts.func_fuzzer.Usb_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
-    srcs: [
-        ":android.hardware.usb@1.0_hal",
-    ],
-    out: [
-        "android/hardware/usb/1.0/Usb.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.usb@1.0-vts.func_fuzzer.Usb",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.usb@1.0-vts.func_fuzzer.Usb_genc++"],
-    shared_libs: [
-        "android.hardware.usb@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/utils/Android.bp b/func_fuzzer/utils/Android.bp
deleted file mode 100644
index f96e6ac..0000000
--- a/func_fuzzer/utils/Android.bp
+++ /dev/null

@@ -1,21 +0,0 @@
-//
-// Copyright (C) 2017 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.
-//
-
-cc_library_shared {
-    name: "libvts_func_fuzzer_utils",
-    srcs: ["FuncFuzzerUtils.cpp"],
-    export_include_dirs: ["."],
-}

diff --git a/func_fuzzer/utils/FuncFuzzerUtils.cpp b/func_fuzzer/utils/FuncFuzzerUtils.cpp
deleted file mode 100644
index bbe6d14..0000000
--- a/func_fuzzer/utils/FuncFuzzerUtils.cpp
+++ /dev/null

@@ -1,69 +0,0 @@
-/*
- * Copyright 2017 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.
- */
-
-#include "FuncFuzzerUtils.h"
-#include <getopt.h>
-
-namespace android {
-namespace vts {
-
-static void usage() {
-  fprintf(
-      stdout,
-      "Usage:\n"
-      "\n"
-      "./<fuzzer> <vts flags> -- <libfuzzer flags>\n"
-      "\n"
-      "VTS flags (strictly in form --flag=value):\n"
-      "\n"
-      " vts_target_func \tName of function to be fuzzed.\n"
-      "\n"
-      "libfuzzer flags (strictly in form -flag=value):\n"
-      " Use -help=1 to see libfuzzer flags\n"
-      "Example:\n"
-      "./<fuzzer_name> --vts_target_func=\"foo\" -- -max_len=128 -runs=100\n"
-      "\n");
-}
-
-static struct option long_options[] = {
-    {"help", no_argument, 0, 'h'},
-    {"vts_target_function", required_argument, 0, 't'}
-};
-
-
-FuncFuzzerParams ExtractFuncFuzzerParams(int argc, char **argv) {
-  FuncFuzzerParams params;
-  int opt = 0;
-  int index = 0;
-  while ((opt = getopt_long_only(argc, argv, "", long_options, &index)) != -1) {
-    switch (opt) {
-      case 'h':
-        usage();
-        exit(0);
-      case 't':
-        params.target_func_ = optarg;
-        break;
-      default:
-        // Ignore. This option will be handled by libfuzzer.
-        break;
-    }
-  }
-  return params;
-}
-
-}  // namespace vts
-}  // namespace android
-

diff --git a/func_fuzzer/utils/FuncFuzzerUtils.h b/func_fuzzer/utils/FuncFuzzerUtils.h
deleted file mode 100644
index 3fcfc53..0000000
--- a/func_fuzzer/utils/FuncFuzzerUtils.h
+++ /dev/null

@@ -1,37 +0,0 @@
-/*
- * Copyright 2017 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.
- */
-
-#ifndef __VTS_FUZZ_FUNC_FUZZER_UTILS_H__
-#define __VTS_FUZZ_FUNC_FUZZER_UTILS_H__
-
-#include <string>
-
-namespace android {
-namespace vts {
-
-// Additional non-libfuzzer parameters passed to the fuzzer.
-struct FuncFuzzerParams {
-  // Name of function to fuzz.
-  std::string target_func_;
-};
-
-// Parses command-line flags to create a FuncFuzzerParams instance.
-FuncFuzzerParams ExtractFuncFuzzerParams(int argc, char **argv);
-
-}  // namespace vts
-}  // namespace android
-
-#endif  // __VTS_FUZZ_FUNC_FUZZER_UTILS_H__

diff --git a/func_fuzzer/vibrator/Android.bp b/func_fuzzer/vibrator/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/vibrator/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/vibrator/V1_0/Android.bp b/func_fuzzer/vibrator/V1_0/Android.bp
deleted file mode 100644
index 43c676a..0000000
--- a/func_fuzzer/vibrator/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.vibrator@1.0-vts.func_fuzzer.Vibrator_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
-    srcs: [
-        ":android.hardware.vibrator@1.0_hal",
-    ],
-    out: [
-        "android/hardware/vibrator/1.0/Vibrator.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.vibrator@1.0-vts.func_fuzzer.Vibrator",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.vibrator@1.0-vts.func_fuzzer.Vibrator_genc++"],
-    shared_libs: [
-        "android.hardware.vibrator@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/vr/Android.bp b/func_fuzzer/vr/Android.bp
deleted file mode 100644
index 0b262f8..0000000
--- a/func_fuzzer/vr/Android.bp
+++ /dev/null

@@ -1,5 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-]

diff --git a/func_fuzzer/vr/V1_0/Android.bp b/func_fuzzer/vr/V1_0/Android.bp
deleted file mode 100644
index 52d3088..0000000
--- a/func_fuzzer/vr/V1_0/Android.bp
+++ /dev/null

@@ -1,35 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.vr@1.0-vts.func_fuzzer.Vr_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
-    srcs: [
-        ":android.hardware.vr@1.0_hal",
-    ],
-    out: [
-        "android/hardware/vr/1.0/Vr.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.vr@1.0-vts.func_fuzzer.Vr",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.vr@1.0-vts.func_fuzzer.Vr_genc++"],
-    shared_libs: [
-        "android.hardware.vr@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/wifi/Android.bp b/func_fuzzer/wifi/Android.bp
deleted file mode 100644
index 3e67a64..0000000
--- a/func_fuzzer/wifi/Android.bp
+++ /dev/null

@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-subdirs = [
-    "V1_0",
-    "supplicant/V1_0",
-]

diff --git a/func_fuzzer/wifi/V1_0/Android.bp b/func_fuzzer/wifi/V1_0/Android.bp
deleted file mode 100644
index 41bef9c..0000000
--- a/func_fuzzer/wifi/V1_0/Android.bp
+++ /dev/null

@@ -1,266 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.Wifi_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/Wifi.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.Wifi",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.Wifi_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiApIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiApIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiApIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiApIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiChip_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiChip.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiChip",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiChip_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiNanIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiNanIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiNanIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiNanIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiP2pIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiP2pIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiP2pIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiP2pIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiRttController_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiRttController.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiRttController",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiRttController_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiStaIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
-    srcs: [
-        ":android.hardware.wifi@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/1.0/WifiStaIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi@1.0-vts.func_fuzzer.WifiStaIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi@1.0-vts.func_fuzzer.WifiStaIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/func_fuzzer/wifi/supplicant/V1_0/Android.bp b/func_fuzzer/wifi/supplicant/V1_0/Android.bp
deleted file mode 100644
index 266998f..0000000
--- a/func_fuzzer/wifi/supplicant/V1_0/Android.bp
+++ /dev/null

@@ -1,233 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.Supplicant_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/Supplicant.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.Supplicant",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.Supplicant_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/SupplicantIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantNetwork_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/SupplicantNetwork.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantNetwork",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantNetwork_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantP2pIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/SupplicantP2pIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantP2pIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantP2pIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantP2pNetwork_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetwork.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantP2pNetwork",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantP2pNetwork_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantStaIface_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/SupplicantStaIface.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantStaIface",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantStaIface_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-
-genrule {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantStaNetwork_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
-    srcs: [
-        ":android.hardware.wifi.supplicant@1.0_hal",
-    ],
-    out: [
-        "android/hardware/wifi/supplicant/1.0/SupplicantStaNetwork.vts.cpp",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantStaNetwork",
-    defaults: ["func_fuzzer_defaults"],
-    srcs: [":android.hardware.wifi.supplicant@1.0-vts.func_fuzzer.SupplicantStaNetwork_genc++"],
-    shared_libs: [
-        "android.hardware.wifi.supplicant@1.0",
-        "libcutils",
-        "liblog",
-        "libutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libhardware",
-        "libvts_func_fuzzer_utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-        "-fno-omit-frame-pointer",
-    ],
-}
-

diff --git a/iface_fuzzer/Android.bp b/iface_fuzzer/Android.bp
index fec05fb..b611bac 100644
--- a/iface_fuzzer/Android.bp
+++ b/iface_fuzzer/Android.bp

@@ -14,13 +14,14 @@
 // limitations under the License.
 //
 
-cc_library_shared {
+cc_library {
     name: "libvts_proto_fuzzer",
     srcs: [
         "ProtoFuzzerUtils.cpp",
         "ProtoFuzzerMutator.cpp",
         "ProtoFuzzerMutateFns.cpp",
         "ProtoFuzzerRunner.cpp",
+        "ProtoFuzzerStats.cpp",
     ],
     include_dirs: [
         "test/vts/drivers/hal/common/include",
@@ -34,6 +35,8 @@
         "libvts_proto_fuzzer_proto",
     ],
     cflags: [
+        "-Wall",
+        "-Werror",
         "-Wno-unused-parameter",
     ],
 }
@@ -50,15 +53,18 @@
     ],
     shared_libs: [
         "libprotobuf-cpp-full",
+        "libvintf",
         "libvts_common",
         "libvts_multidevice_proto",
-        "libvts_proto_fuzzer",
         "libvts_proto_fuzzer_proto",
     ],
     static_libs: [
         "libFuzzer",
+        "libvts_proto_fuzzer",
     ],
     cflags: [
+        "-Wall",
+        "-Werror",
         "-Wno-unused-parameter",
         "-Wno-macro-redefined",
         "-Wno-extra-tokens",

diff --git a/iface_fuzzer/ProtoFuzzerMain.cpp b/iface_fuzzer/ProtoFuzzerMain.cpp
index 6b79192..5310507 100644
--- a/iface_fuzzer/ProtoFuzzerMain.cpp
+++ b/iface_fuzzer/ProtoFuzzerMain.cpp

@@ -20,6 +20,7 @@
 
 #include <unistd.h>
 
+#include <cstdlib>
 #include <iostream>
 #include <memory>
 #include <string>
@@ -37,7 +38,7 @@
 namespace fuzzer {
 
 // 64-bit random number generator.
-static Random random{static_cast<uint64_t>(time(0))};
+static unique_ptr<Random> random;
 // Parameters that were passed in to fuzzer.
 static ProtoFuzzerParams params;
 // Used to mutate inputs to hal driver.
@@ -70,20 +71,42 @@
     // Odds of an enum being treated like a scalar are 1:1000.
     {1, 1000}};
 
+// Executed when fuzzer process exits. We use this to print out useful
+// information about the state of the fuzzer.
+static void AtExit() {
+  // Print currently opened interfaces.
+  cerr << "Currently opened interfaces: " << endl;
+  for (const auto &iface_desc : runner->GetOpenedIfaces()) {
+    cerr << iface_desc.first << endl;
+  }
+  cerr << endl;
+  cerr << runner->GetStats().StatsString();
+}
+
 extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) {
   params = ExtractProtoFuzzerParams(*argc, *argv);
+  cerr << params.DebugString() << endl;
+
+  random = make_unique<Random>(params.seed_);
   mutator = make_unique<ProtoFuzzerMutator>(
-      random, ExtractPredefinedTypes(params.comp_specs_), mutator_config);
+      *random.get(), ExtractPredefinedTypes(params.comp_specs_),
+      mutator_config);
   runner = make_unique<ProtoFuzzerRunner>(params.comp_specs_);
 
   runner->Init(params.target_iface_, params.binder_mode_);
+  // Register atexit handler after all static objects' initialization.
+  std::atexit(AtExit);
   return 0;
 }
 
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t *data, size_t size,
                                           size_t max_size, unsigned int seed) {
   ExecSpec exec_spec{};
-  if (!FromArray(data, size, &exec_spec)) {
+  // An Execution is randomly generated if:
+  // 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.
+  if (!FromArray(data, size, &exec_spec) || runner->UntouchedIfaces()) {
     exec_spec =
         mutator->RandomGen(runner->GetOpenedIfaces(), params.exec_size_);
   } else {

diff --git a/iface_fuzzer/ProtoFuzzerMutateFns.cpp b/iface_fuzzer/ProtoFuzzerMutateFns.cpp
index 09fad15..06c6cf5 100644
--- a/iface_fuzzer/ProtoFuzzerMutateFns.cpp
+++ b/iface_fuzzer/ProtoFuzzerMutateFns.cpp

@@ -30,7 +30,7 @@
     result.set_type(var_spec.type());
   } else {
     cerr << "VarInstance with no type field: " << var_spec.DebugString();
-    exit(1);
+    std::abort();
   }
   if (var_spec.has_name()) {
     result.set_name(var_spec.name());

diff --git a/iface_fuzzer/ProtoFuzzerMutator.cpp b/iface_fuzzer/ProtoFuzzerMutator.cpp
index 4941382..10c1f78 100644
--- a/iface_fuzzer/ProtoFuzzerMutator.cpp
+++ b/iface_fuzzer/ProtoFuzzerMutator.cpp

@@ -17,9 +17,9 @@
 #include "ProtoFuzzerMutator.h"
 #include <iostream>
 
-using std::endl;
 using std::cerr;
 using std::cout;
+using std::endl;
 using std::make_unique;
 using std::unordered_map;
 using namespace std::placeholders;
@@ -61,6 +61,9 @@
   random_gen_fns_[TYPE_HIDL_INTERFACE] = default_transform;
   mutate_fns_[TYPE_HIDL_INTERFACE] = default_transform;
 
+  random_gen_fns_[TYPE_HIDL_MEMORY] = default_transform;
+  mutate_fns_[TYPE_HIDL_MEMORY] = default_transform;
+
   // Interpret masks as enums.
   random_gen_fns_[TYPE_MASK] =
       std::bind(&ProtoFuzzerMutator::EnumRandomGen, this, _1);
@@ -106,6 +109,7 @@
 
 ExecSpec ProtoFuzzerMutator::RandomGen(const IfaceDescTbl &tbl,
                                        size_t num_calls) {
+  cerr << "Generating a random execution." << endl;
   ExecSpec result{};
   for (size_t i = 0; i < num_calls; ++i) {
     const CompSpec *comp_spec = RandomSelectIface(tbl);
@@ -182,7 +186,7 @@
   auto transform_fn = transform_fns.find(type);
   if (transform_fn == transform_fns.end()) {
     cerr << "Transformation function not found for type: " << type << endl;
-    exit(1);
+    std::abort();
   }
   return transform_fn->second(var_spec);
 }
@@ -199,7 +203,7 @@
   auto type_spec = predefined_types_.find(name);
   if (type_spec == predefined_types_.end()) {
     cerr << "Predefined type not found: " << name << endl;
-    exit(1);
+    std::abort();
   }
   return type_spec->second;
 }

diff --git a/iface_fuzzer/ProtoFuzzerRunner.cpp b/iface_fuzzer/ProtoFuzzerRunner.cpp
index dddefb9..0088c14 100644
--- a/iface_fuzzer/ProtoFuzzerRunner.cpp
+++ b/iface_fuzzer/ProtoFuzzerRunner.cpp

@@ -21,15 +21,17 @@
 
 #include "utils/InterfaceSpecUtil.h"
 #include "vintf/HalManifest.h"
+#include "vintf/Version.h"
 #include "vintf/VintfObject.h"
 
 using android::vintf::HalManifest;
+using android::vintf::Version;
 
-using std::cout;
 using std::cerr;
+using std::cout;
 using std::string;
-using std::vector;
 using std::unordered_map;
+using std::vector;
 
 namespace android {
 namespace vts {
@@ -45,15 +47,21 @@
 }
 
 static string GetServiceName(const CompSpec &comp_spec) {
-  static const HalManifest *vendor_manifest =
-      ::android::vintf::VintfObject::GetDeviceHalManifest();
   string hal_name = comp_spec.package();
+  string hal_version = GetVersionString(comp_spec.component_type_version());
   string iface_name = comp_spec.component_name();
 
-  auto instance_names = vendor_manifest->getInstances(hal_name, iface_name);
+  size_t major_version =
+      std::stoul(hal_version.substr(0, hal_version.find(".")));
+  size_t minor_version =
+      std::stoul(hal_version.substr(hal_version.find(".") + 1));
+
+  auto instance_names =
+      ::android::vintf::VintfObject::GetDeviceHalManifest()->getInstances(
+          hal_name, Version(major_version, minor_version), iface_name);
   if (instance_names.empty()) {
     cerr << "HAL service name not available in VINTF." << endl;
-    exit(1);
+    std::abort();
   }
 
   // For fuzzing we don't care which instance of the HAL is targeted.
@@ -68,14 +76,13 @@
 }
 
 static void *Dlopen(string lib_name) {
-  const char *error;
   // Clear dlerror().
   dlerror();
   void *handle = dlopen(lib_name.c_str(), RTLD_LAZY);
   if (!handle) {
     cerr << __func__ << ": " << dlerror() << endl;
     cerr << __func__ << ": Can't load shared library: " << lib_name << endl;
-    exit(1);
+    std::abort();
   }
   return handle;
 }
@@ -88,7 +95,7 @@
   if ((error = dlerror()) != NULL) {
     cerr << __func__ << ": Can't find: " << function_name << endl;
     cerr << error << endl;
-    exit(1);
+    std::abort();
   }
   return function;
 }
@@ -109,7 +116,7 @@
 
   if (!hal->GetService(false, service_name.c_str())) {
     cerr << __func__ << ": Failed to open HAL in binder mode." << endl;
-    exit(1);
+    std::abort();
   } else {
     cerr << "HAL opened in binder mode." << endl;
     return;
@@ -119,7 +126,6 @@
 DriverBase *ProtoFuzzerRunner::LoadInterface(const CompSpec &comp_spec,
                                              uint64_t hidl_service = 0) {
   DriverBase *hal;
-  const char *error;
   // Clear dlerror().
   dlerror();
 
@@ -184,12 +190,13 @@
   auto iface_desc = opened_ifaces_.find(iface_name);
   if (iface_desc == opened_ifaces_.end()) {
     cerr << "Interface is not open: " << iface_name << endl;
-    exit(1);
+    std::abort();
   }
 
   FuncSpec result{};
   iface_desc->second.hal_->CallFunction(func_spec, "", &result);
 
+  stats_.RegisterTouch(iface_name, func_spec.name());
   ProcessReturnValue(result);
 }
 
@@ -203,7 +210,10 @@
 
 void ProtoFuzzerRunner::ProcessReturnValue(const FuncSpec &result) {
   for (const auto &var : result.return_type_hidl()) {
-    if (var.has_hidl_interface_pointer() && var.has_predefined_type()) {
+    // If result contains a pointer to an interface, register it in
+    // opened_ifaces_ table. That pointer must not be a nullptr.
+    if (var.has_hidl_interface_pointer() && var.hidl_interface_pointer() &&
+        var.has_predefined_type()) {
       uint64_t hidl_service = var.hidl_interface_pointer();
       string type = var.predefined_type();
       string iface_name = StripNamespace(type);
@@ -211,6 +221,11 @@
       const CompSpec *comp_spec = FindCompSpec(iface_name);
       std::shared_ptr<DriverBase> hal{LoadInterface(*comp_spec, hidl_service)};
 
+      // If this interface has not been seen before, record the fact.
+      if (opened_ifaces_.find(iface_name) == opened_ifaces_.end()) {
+        cerr << "Discovered new interface: " << iface_name << endl;
+      }
+
       // Register this interface as opened by the runner.
       opened_ifaces_[iface_name] = {
           .comp_spec_ = comp_spec, .hal_ = hal,
@@ -223,7 +238,7 @@
   auto comp_spec = comp_specs_.find(name);
   if (comp_spec == comp_specs_.end()) {
     cerr << "VTS spec not found: " << name << endl;
-    exit(1);
+    std::abort();
   }
   return &comp_spec->second;
 }

diff --git a/iface_fuzzer/ProtoFuzzerStats.cpp b/iface_fuzzer/ProtoFuzzerStats.cpp
new file mode 100644
index 0000000..da65c7f
--- /dev/null
+++ b/iface_fuzzer/ProtoFuzzerStats.cpp

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2017 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.
+ */
+
+#include "ProtoFuzzerStats.h"
+
+#include <iomanip>
+#include <iostream>
+#include <map>
+#include <sstream>
+
+using std::endl;
+using std::map;
+using std::string;
+using std::unordered_map;
+
+namespace android {
+namespace vts {
+namespace fuzzer {
+
+void ProtoFuzzerStats::RegisterTouch(string iface_name, string func_name) {
+  // Update the touch count for the full function name.
+  string key = iface_name + "::" + func_name;
+  touch_count_[key]++;
+  // Record that this interface has been touched.
+  touched_ifaces_.insert(std::move(iface_name));
+}
+
+string ProtoFuzzerStats::StatsString() const {
+  std::map<string, uint64_t> ordered_result{touch_count_.cbegin(),
+                                            touch_count_.cend()};
+
+  std::stringstream ss{};
+  ss << "HAL api function touch count: " << endl;
+  for (const auto &entry : ordered_result) {
+    ss << std::left << std::setfill(' ') << std::setw(40) << entry.first
+       << std::setw(40) << entry.second << endl;
+  }
+  ss << endl;
+  return ss.str();
+}
+
+}  // namespace fuzzer
+}  // namespace vts
+}  // namespace android

diff --git a/iface_fuzzer/ProtoFuzzerUtils.cpp b/iface_fuzzer/ProtoFuzzerUtils.cpp
index 6dbdb0a..b9a5635 100644
--- a/iface_fuzzer/ProtoFuzzerUtils.cpp
+++ b/iface_fuzzer/ProtoFuzzerUtils.cpp

@@ -23,8 +23,8 @@
 
 #include "utils/InterfaceSpecUtil.h"
 
-using std::cout;
 using std::cerr;
+using std::cout;
 using std::string;
 using std::unordered_map;
 using std::vector;
@@ -34,25 +34,26 @@
 namespace fuzzer {
 
 static void usage() {
-  fprintf(
-      stdout,
-      "Usage:\n"
-      "\n"
-      "./vts_proto_fuzzer <vts flags> -- <libfuzzer flags>\n"
-      "\n"
-      "VTS flags (strictly in form --flag=value):\n"
-      "\n"
-      "\tvts_binder_mode: if set, fuzzer will open the HAL in binder mode.\n"
-      "\tvts_exec_size: number of function calls per 1 run of "
-      "LLVMFuzzerTestOneInput.\n"
-      "\tvts_spec_dir: \":\"-separated list of directories on the target "
-      "containing .vts spec files.\n"
-      "\tvts_target_iface: name of interface targeted for fuzz, e.g. "
-      "\"INfc\".\n"
-      "\n"
-      "libfuzzer flags (strictly in form -flag=value):\n"
-      "\tUse -help=1 to see libfuzzer flags\n"
-      "\n");
+  cout
+      << "Usage:\n"
+         "\n"
+         "./vts_proto_fuzzer <vts flags> -- <libfuzzer flags>\n"
+         "\n"
+         "VTS flags (strictly in form --flag=value):\n"
+         "\n"
+         "\tvts_binder_mode: if set, fuzzer will open the HAL in binder mode.\n"
+         "\tvts_exec_size: number of function calls per 1 run of "
+         "LLVMFuzzerTestOneInput.\n"
+         "\tvts_spec_dir: \":\"-separated list of directories on the target "
+         "containing .vts spec files.\n"
+         "\tvts_target_iface: name of interface targeted for fuzz, e.g. "
+         "\"INfc\".\n"
+         "\tvts_seed: optional integral argument used to initalize the random "
+         "number generator.\n"
+         "\n"
+         "libfuzzer flags (strictly in form -flag=value):\n"
+         "\tUse -help=1 to see libfuzzer flags\n"
+         "\n";
 }
 
 static struct option long_options[] = {
@@ -60,6 +61,7 @@
     {"vts_binder_mode", no_argument, 0, 'b'},
     {"vts_spec_dir", required_argument, 0, 'd'},
     {"vts_exec_size", required_argument, 0, 'e'},
+    {"vts_seed", required_argument, 0, 's'},
     {"vts_target_iface", required_argument, 0, 't'}};
 
 // Removes information from CompSpec not needed by fuzzer.
@@ -86,12 +88,11 @@
     struct dirent *ent;
     if (!(dir = opendir(dir_path.c_str()))) {
       cerr << "Could not open directory: " << dir_path << endl;
-      exit(1);
+      std::abort();
     }
     while ((ent = readdir(dir))) {
       string vts_spec_name{ent->d_name};
       if (vts_spec_name.find(".vts") != string::npos) {
-        cout << "Loading: " << vts_spec_name << endl;
         string vts_spec_path = dir_path + "/" + vts_spec_name;
         CompSpec comp_spec{};
         ParseInterfaceSpec(vts_spec_path.c_str(), &comp_spec);
@@ -107,9 +108,14 @@
     const TypeSpec &var_spec,
     unordered_map<string, TypeSpec> &predefined_types) {
   predefined_types[var_spec.name()] = var_spec;
+  // Find all nested struct declarations.
   for (const auto &sub_var_spec : var_spec.sub_struct()) {
     ExtractPredefinedTypesFromVar(sub_var_spec, predefined_types);
   }
+  // Find all nested union declarations.
+  for (const auto &sub_var_spec : var_spec.sub_union()) {
+    ExtractPredefinedTypesFromVar(sub_var_spec, predefined_types);
+  }
 }
 
 ProtoFuzzerParams ExtractProtoFuzzerParams(int argc, char **argv) {
@@ -120,7 +126,7 @@
     switch (opt) {
       case 'h':
         usage();
-        exit(0);
+        std::abort();
       case 'b':
         params.binder_mode_ = true;
         break;
@@ -128,7 +134,10 @@
         params.comp_specs_ = ExtractCompSpecs(optarg);
         break;
       case 'e':
-        params.exec_size_ = atoi(optarg);
+        params.exec_size_ = std::stoul(optarg);
+        break;
+      case 's':
+        params.seed_ = std::stoull(optarg);
         break;
       case 't':
         params.target_iface_ = optarg;
@@ -141,6 +150,19 @@
   return params;
 }
 
+string ProtoFuzzerParams::DebugString() const {
+  std::stringstream ss;
+  ss << "Execution size: " << exec_size_ << endl;
+  ss << "Target interface: " << target_iface_ << endl;
+  ss << "Binder mode: " << binder_mode_ << endl;
+  ss << "Seed: " << seed_ << endl;
+  ss << "Loaded specs: " << endl;
+  for (const auto &spec : comp_specs_) {
+    ss << spec.component_name() << endl;
+  }
+  return ss.str();
+}
+
 unordered_map<string, TypeSpec> ExtractPredefinedTypes(
     const vector<CompSpec> &specs) {
   unordered_map<string, TypeSpec> predefined_types;

diff --git a/iface_fuzzer/include/ProtoFuzzerRunner.h b/iface_fuzzer/include/ProtoFuzzerRunner.h
index 179b059..3bb0bc4 100644
--- a/iface_fuzzer/include/ProtoFuzzerRunner.h
+++ b/iface_fuzzer/include/ProtoFuzzerRunner.h

@@ -17,6 +17,7 @@
 #ifndef __VTS_PROTO_FUZZER_RUNNER_H_
 #define __VTS_PROTO_FUZZER_RUNNER_H_
 
+#include "ProtoFuzzerStats.h"
 #include "ProtoFuzzerUtils.h"
 
 #include <memory>
@@ -50,6 +51,12 @@
   // Accessor to interface descriptor table containing currently opened
   // interfaces.
   const IfaceDescTbl &GetOpenedIfaces() const { return opened_ifaces_; }
+  // Accessor to stats object.
+  const ProtoFuzzerStats &GetStats() const { return stats_; }
+  // Returns true iff there are opened interfaces that are untouched.
+  bool UntouchedIfaces() const {
+    return opened_ifaces_.size() > stats_.TouchedIfaces().size();
+  }
 
  private:
   // Looks up interface spec by name.
@@ -66,6 +73,9 @@
   std::unordered_map<std::string, CompSpec> comp_specs_;
   // Handle to the driver library.
   void *driver_handle_;
+
+  // Collects statistical information.
+  ProtoFuzzerStats stats_;
 };
 
 }  // namespace fuzzer

diff --git a/iface_fuzzer/include/ProtoFuzzerStats.h b/iface_fuzzer/include/ProtoFuzzerStats.h
new file mode 100644
index 0000000..5052817
--- /dev/null
+++ b/iface_fuzzer/include/ProtoFuzzerStats.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017 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.
+ */
+
+#ifndef __VTS_PROTO_FUZZER_STATS_H_
+#define __VTS_PROTO_FUZZER_STATS_H_
+
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace android {
+namespace vts {
+namespace fuzzer {
+
+// Holds stats about a fuzzer run.
+class ProtoFuzzerStats {
+ public:
+  // Registers fuzzer touching an interface function.
+  void RegisterTouch(std::string iface_name, std::string func_name);
+  // Returns collected stats in string form.
+  std::string StatsString() const;
+  // Returns the set of touched interfaces.
+  const std::unordered_set<std::string> &TouchedIfaces() const {
+    return touched_ifaces_;
+  }
+
+ private:
+  // Counts the number of times a function was touched.
+  // This object will be written to often, so we use unordered_map.
+  std::unordered_map<std::string, uint64_t> touch_count_;
+  // The set of interfaces that have been touched to far.
+  std::unordered_set<std::string> touched_ifaces_;
+};
+
+}  // namespace fuzzer
+}  // namespace vts
+}  // namespace android
+
+#endif  // __VTS_PROTO_FUZZER_STATS__

diff --git a/iface_fuzzer/include/ProtoFuzzerUtils.h b/iface_fuzzer/include/ProtoFuzzerUtils.h
index 85af37f..cc0f7e8 100644
--- a/iface_fuzzer/include/ProtoFuzzerUtils.h
+++ b/iface_fuzzer/include/ProtoFuzzerUtils.h

@@ -17,6 +17,7 @@
 #ifndef __VTS_PROTO_FUZZER_UTILS_H__
 #define __VTS_PROTO_FUZZER_UTILS_H__
 
+#include <unistd.h>
 #include <iostream>
 #include <random>
 #include <string>
@@ -64,7 +65,8 @@
 };
 
 // Additional non-libfuzzer parameters passed to the fuzzer.
-struct ProtoFuzzerParams {
+class ProtoFuzzerParams {
+ public:
   // Number of function calls per execution (fixed throughout fuzzer run).
   size_t exec_size_;
   // VTS specs supplied to the fuzzer.
@@ -72,8 +74,12 @@
   // Name of target interface, e.g. "INfc".
   std::string target_iface_;
   // Controls whether HAL is opened in passthrough or binder mode.
-  // Passthrough mode is default. Used for testing.
-  bool binder_mode_ = false;
+  // Binder mode is default. Used for testing.
+  bool binder_mode_ = true;
+  // Seed used to initialize the random number generator.
+  uint64_t seed_ = static_cast<uint64_t>(time(0));
+  // Returns a string summarizing content of this object.
+  string DebugString() const;
 };
 
 // Parses command-line flags to create a ProtoFuzzerParams instance.

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

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="{TEST_TYPE_CAMEL}Test.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="{TEST_NAME}"/>
         <option name="hal-hidl-package-name" value="android.hardware.{HAL_NAME}@{HAL_VERSION}"/>

diff --git a/template/func_fuzzer_test/func_fuzzer_test.py b/template/func_fuzzer_test/func_fuzzer_test.py
index dcbbb3c..b4fbf04 100644
--- a/template/func_fuzzer_test/func_fuzzer_test.py
+++ b/template/func_fuzzer_test/func_fuzzer_test.py

@@ -51,6 +51,7 @@
                      self.hal_hidl_package_name)
 
         self._dut = self.registerController(android_device, False)[0]
+        self._dut.startAdbLogcat()
         self._dut.adb.shell('mkdir %s -p' % config.FUZZER_TEST_DIR)
         self._vts_spec_parser = vts_spec_utils.VtsSpecParser(
             self.data_file_path)

diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py
index 59d7ebb..8dde8f4 100644
--- a/template/iface_fuzzer_test/iface_fuzzer_test.py
+++ b/template/iface_fuzzer_test/iface_fuzzer_test.py

@@ -111,8 +111,8 @@
             }
             libfuzzer_params = config.FUZZER_DEFAULT_PARAMS.copy()
             libfuzzer_params.update({
-                'max_len': 65536,
-                'max_total_time': 10,
+                'max_len': 16777216,
+                'max_total_time': 600,
             })
             bin_host_path = os.path.join(self.data_file_path, 'DATA', 'bin',
                                          'vts_proto_fuzzer')
commit	bc19455b588b4c27d5284193344bbffebd498cb4	[log] [tgz]
author	Hsin-Yi Chen <hsinyichen@google.com>	Fri Jan 26 21:38:57 2018 +0000
committer	android-build-merger <android-build-merger@google.com>	Fri Jan 26 21:38:57 2018 +0000
tree	452b75a1600e886483060a8a6fc0b27f7fa19138
parent	5d4da3de43b7366878bc472382aee3f2e0d69189 [diff]
parent	8d5000d37a18c0d8e437fc52157dffd1281c5a2c [diff]