Deprecate func_fuzzer config files.
am: d2267d63de
Change-Id: Ia67dfda744b995d7d045163c850ec2ac66f3f625
diff --git a/config/audio/V2_0/func_fuzzer/Android.mk b/config/audio/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index a289a57..0000000
--- a/config/audio/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalAudioV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 7d8e800..0000000
--- a/config/audio/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalAudioV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalAudioV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/audio/common/V2_0/func_fuzzer/Android.mk b/config/audio/common/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index 8d09d60..0000000
--- a/config/audio/common/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalAudioCommonV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index dabad99..0000000
--- a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalAudioCommonV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalAudioCommonV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/audio/effect/V2_0/func_fuzzer/Android.mk b/config/audio/effect/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index 0ce8569..0000000
--- a/config/audio/effect/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalAudioEffectV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 22b50cd..0000000
--- a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalAudioEffectV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalAudioEffectV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/automotive/evs/V1_0/func_fuzzer/Android.mk b/config/automotive/evs/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 3d4563b..0000000
--- a/config/automotive/evs/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalAutomotiveEvsV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index c06b76b..0000000
--- a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalAutomotiveEvsV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalAutomotiveEvsV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/automotive/vehicle/V2_0/func_fuzzer/Android.mk b/config/automotive/vehicle/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index b6358c9..0000000
--- a/config/automotive/vehicle/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalAutomotiveVehicleV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index f7b9b9b..0000000
--- a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalAutomotiveVehicleV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/automotive/vehicle/V2_1/func_fuzzer/Android.mk b/config/automotive/vehicle/V2_1/func_fuzzer/Android.mk
deleted file mode 100644
index 04a82c6..0000000
--- a/config/automotive/vehicle/V2_1/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalAutomotiveVehicleV2_1FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 54b02e0..0000000
--- a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalAutomotiveVehicleV2_1FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_1FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.1"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/biometrics/fingerprint/V2_1/func_fuzzer/Android.mk b/config/biometrics/fingerprint/V2_1/func_fuzzer/Android.mk
deleted file mode 100644
index bf97d70..0000000
--- a/config/biometrics/fingerprint/V2_1/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalBiometricsFingerprintV2_1FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 452fa4e..0000000
--- a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalBiometricsFingerprintV2_1FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/bluetooth/V1_0/func_fuzzer/Android.mk b/config/bluetooth/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index f12299c..0000000
--- a/config/bluetooth/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalBluetoothV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 48b156b..0000000
--- a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalBluetoothV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalBluetoothV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/boot/V1_0/func_fuzzer/Android.mk b/config/boot/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 8b4894b..0000000
--- a/config/boot/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalBootV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/boot/V1_0/func_fuzzer/AndroidTest.xml b/config/boot/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 27e132f..0000000
--- a/config/boot/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalBootV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalBootV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/broadcastradio/V1_0/func_fuzzer/Android.mk b/config/broadcastradio/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index e73a883..0000000
--- a/config/broadcastradio/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalBroadcastradioV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 8dc530c..0000000
--- a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalBroadcastradioV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalBroadcastradioV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/broadcastradio/V1_1/func_fuzzer/Android.mk b/config/broadcastradio/V1_1/func_fuzzer/Android.mk
deleted file mode 100644
index 39f65a2..0000000
--- a/config/broadcastradio/V1_1/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalBroadcastradioV1_1FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 8aaa030..0000000
--- a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalBroadcastradioV1_1FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalBroadcastradioV1_1FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/camera/common/V1_0/func_fuzzer/Android.mk b/config/camera/common/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 9c64785..0000000
--- a/config/camera/common/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalCameraCommonV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 6280250..0000000
--- a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalCameraCommonV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalCameraCommonV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.camera.common@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/camera/device/V1_0/func_fuzzer/Android.mk b/config/camera/device/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 14115b5..0000000
--- a/config/camera/device/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalCameraDeviceV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 70253b4..0000000
--- a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalCameraDeviceV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalCameraDeviceV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/camera/device/V3_2/func_fuzzer/Android.mk b/config/camera/device/V3_2/func_fuzzer/Android.mk
deleted file mode 100644
index 1f530f6..0000000
--- a/config/camera/device/V3_2/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalCameraDeviceV3_2FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index b98a7d2..0000000
--- a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalCameraDeviceV3_2FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalCameraDeviceV3_2FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/camera/metadata/V3_2/func_fuzzer/Android.mk b/config/camera/metadata/V3_2/func_fuzzer/Android.mk
deleted file mode 100644
index 4828765..0000000
--- a/config/camera/metadata/V3_2/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalCameraMetadataV3_2FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index a72ad8b..0000000
--- a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalCameraMetadataV3_2FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalCameraMetadataV3_2FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/camera/provider/V2_4/func_fuzzer/Android.mk b/config/camera/provider/V2_4/func_fuzzer/Android.mk
deleted file mode 100644
index 3ebf990..0000000
--- a/config/camera/provider/V2_4/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalCameraProviderV2_4FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index b44c510..0000000
--- a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalCameraProviderV2_4FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalCameraProviderV2_4FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/configstore/V1_0/func_fuzzer/Android.mk b/config/configstore/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index fc94dcf..0000000
--- a/config/configstore/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalConfigstoreV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index c2756f3..0000000
--- a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
- Do not edit manually.
--->
-<configuration description="Config for VtsHalConfigstoreV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalConfigstoreV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/contexthub/V1_0/func_fuzzer/Android.mk b/config/contexthub/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 31e5f6f..0000000
--- a/config/contexthub/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalContexthubV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index ce604af..0000000
--- a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalContexthubV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalContexthubV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/drm/V1_0/func_fuzzer/Android.mk b/config/drm/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 7ecf964..0000000
--- a/config/drm/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalDrmV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/drm/V1_0/func_fuzzer/AndroidTest.xml b/config/drm/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 140587a..0000000
--- a/config/drm/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalDrmV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalDrmV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/dumpstate/V1_0/func_fuzzer/Android.mk b/config/dumpstate/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index ce32bed..0000000
--- a/config/dumpstate/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalDumpstateV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 917f12a..0000000
--- a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalDumpstateV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalDumpstateV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/gatekeeper/V1_0/func_fuzzer/Android.mk b/config/gatekeeper/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index eed774e..0000000
--- a/config/gatekeeper/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGatekeeperV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 5d3f421..0000000
--- a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGatekeeperV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGatekeeperV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/gnss/V1_0/func_fuzzer/Android.mk b/config/gnss/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index f1c3588..0000000
--- a/config/gnss/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGnssV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index cfee4f6..0000000
--- a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGnssV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGnssV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/graphics/allocator/V2_0/func_fuzzer/Android.mk b/config/graphics/allocator/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index 52a963d..0000000
--- a/config/graphics/allocator/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGraphicsAllocatorV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 297b154..0000000
--- a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGraphicsAllocatorV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGraphicsAllocatorV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/graphics/bufferqueue/V1_0/func_fuzzer/Android.mk b/config/graphics/bufferqueue/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 4ddcee2..0000000
--- a/config/graphics/bufferqueue/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGraphicsBufferqueueV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 3a30850..0000000
--- a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGraphicsBufferqueueV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGraphicsBufferqueueV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/graphics/common/V1_0/func_fuzzer/Android.mk b/config/graphics/common/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index e9f4c39..0000000
--- a/config/graphics/common/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGraphicsCommonV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index a1a06c7..0000000
--- a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGraphicsCommonV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGraphicsCommonV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/graphics/composer/V2_1/func_fuzzer/Android.mk b/config/graphics/composer/V2_1/func_fuzzer/Android.mk
deleted file mode 100644
index b1e15d6..0000000
--- a/config/graphics/composer/V2_1/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGraphicsComposerV2_1FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 0348e7b..0000000
--- a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGraphicsComposerV2_1FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGraphicsComposerV2_1FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/graphics/mapper/V2_0/func_fuzzer/Android.mk b/config/graphics/mapper/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index 85fda3c..0000000
--- a/config/graphics/mapper/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalGraphicsMapperV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 1adab76..0000000
--- a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalGraphicsMapperV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalGraphicsMapperV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/health/V1_0/func_fuzzer/Android.mk b/config/health/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index fd2d241..0000000
--- a/config/health/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalHealthV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/health/V1_0/func_fuzzer/AndroidTest.xml b/config/health/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index be4b899..0000000
--- a/config/health/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalHealthV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalHealthV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/ir/V1_0/func_fuzzer/Android.mk b/config/ir/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index bb1bec0..0000000
--- a/config/ir/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalIrV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/ir/V1_0/func_fuzzer/AndroidTest.xml b/config/ir/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index a57bc90..0000000
--- a/config/ir/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalIrV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalIrV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/keymaster/V3_0/func_fuzzer/Android.mk b/config/keymaster/V3_0/func_fuzzer/Android.mk
deleted file mode 100644
index 2932e38..0000000
--- a/config/keymaster/V3_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalKeymasterV3_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 50c0087..0000000
--- a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalKeymasterV3_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalKeymasterV3_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/light/V2_0/func_fuzzer/Android.mk b/config/light/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index f8af7d3..0000000
--- a/config/light/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalLightV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/light/V2_0/func_fuzzer/AndroidTest.xml b/config/light/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 0fa2689..0000000
--- a/config/light/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalLightV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalLightV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/media/V1_0/func_fuzzer/Android.mk b/config/media/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 6e17168..0000000
--- a/config/media/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalMediaV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/media/V1_0/func_fuzzer/AndroidTest.xml b/config/media/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index f91ccf9..0000000
--- a/config/media/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalMediaV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalMediaV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/media/omx/V1_0/func_fuzzer/Android.mk b/config/media/omx/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index c2b3f2d..0000000
--- a/config/media/omx/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalMediaOmxV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index fe93f83..0000000
--- a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalMediaOmxV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalMediaOmxV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/memtrack/V1_0/func_fuzzer/Android.mk b/config/memtrack/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 4c956c4..0000000
--- a/config/memtrack/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalMemtrackV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index a11c679..0000000
--- a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalMemtrackV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalMemtrackV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/nfc/V1_0/func_fuzzer/Android.mk b/config/nfc/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 5dd8107..0000000
--- a/config/nfc/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalNfcV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 59fb7b1..0000000
--- a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalNfcV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalNfcV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/power/V1_0/func_fuzzer/Android.mk b/config/power/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index c137b7e..0000000
--- a/config/power/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalPowerV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/power/V1_0/func_fuzzer/AndroidTest.xml b/config/power/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index d3529e4..0000000
--- a/config/power/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
- Do not edit manually.
--->
-<configuration description="Config for VtsHalPowerV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalPowerV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/radio/V1_0/func_fuzzer/Android.mk b/config/radio/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 70f16d1..0000000
--- a/config/radio/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 7d12785..0000000
--- a/config/radio/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.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_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.radio@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/radio/deprecated/V1_0/func_fuzzer/Android.mk b/config/radio/deprecated/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 9ba37ba..0000000
--- a/config/radio/deprecated/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalRadioDeprecatedV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index e6c4a41..0000000
--- a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalRadioDeprecatedV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalRadioDeprecatedV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/renderscript/V1_0/func_fuzzer/Android.mk b/config/renderscript/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 9ef3f48..0000000
--- a/config/renderscript/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalRenderscriptV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index f046903..0000000
--- a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalRenderscriptV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalRenderscriptV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/sensors/V1_0/func_fuzzer/Android.mk b/config/sensors/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 854739e..0000000
--- a/config/sensors/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalSensorsV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index e0e3c7b..0000000
--- a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalSensorsV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalSensorsV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/soundtrigger/V2_0/func_fuzzer/Android.mk b/config/soundtrigger/V2_0/func_fuzzer/Android.mk
deleted file mode 100644
index c8f2640..0000000
--- a/config/soundtrigger/V2_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalSoundtriggerV2_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index ebb4af5..0000000
--- a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalSoundtriggerV2_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalSoundtriggerV2_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/thermal/V1_0/func_fuzzer/Android.mk b/config/thermal/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 0aeafed..0000000
--- a/config/thermal/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalThermalV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index ed2d13a..0000000
--- a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
- Do not edit manually.
--->
-<configuration description="Config for VtsHalThermalV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalThermalV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/tv/cec/V1_0/func_fuzzer/Android.mk b/config/tv/cec/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index d945a7c..0000000
--- a/config/tv/cec/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalTvCecV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 4a5491b..0000000
--- a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalTvCecV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalTvCecV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.tv.cec@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/tv/input/V1_0/func_fuzzer/Android.mk b/config/tv/input/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 137abf0..0000000
--- a/config/tv/input/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalTvInputV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 7c8791a..0000000
--- a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalTvInputV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalTvInputV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/usb/V1_0/func_fuzzer/Android.mk b/config/usb/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index b4bd2b3..0000000
--- a/config/usb/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalUsbV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/usb/V1_0/func_fuzzer/AndroidTest.xml b/config/usb/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 5194850..0000000
--- a/config/usb/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
- Do not edit manually.
--->
-<configuration description="Config for VtsHalUsbV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalUsbV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/vibrator/V1_0/func_fuzzer/Android.mk b/config/vibrator/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index c90d275..0000000
--- a/config/vibrator/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalVibratorV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index 98101bc..0000000
--- a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
- Do not edit manually.
--->
-<configuration description="Config for VtsHalVibratorV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalVibratorV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/vr/V1_0/func_fuzzer/Android.mk b/config/vr/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 83bcf0b..0000000
--- a/config/vr/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalVrV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/vr/V1_0/func_fuzzer/AndroidTest.xml b/config/vr/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index a3214d2..0000000
--- a/config/vr/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalVrV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalVrV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/wifi/V1_0/func_fuzzer/Android.mk b/config/wifi/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 3aa0c39..0000000
--- a/config/wifi/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalWifiV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index eecc26d..0000000
--- a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
- Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalWifiV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/config/wifi/supplicant/V1_0/func_fuzzer/Android.mk b/config/wifi/supplicant/V1_0/func_fuzzer/Android.mk
deleted file mode 100644
index 2886b57..0000000
--- a/config/wifi/supplicant/V1_0/func_fuzzer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 := VtsHalWifiSupplicantV1_0FuncFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
deleted file mode 100644
index dfc5d81..0000000
--- a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 VtsHalWifiSupplicantV1_0FuncFuzzer test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="FuncFuzzerTest.push"/>
- </target_preparer>
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalWifiSupplicantV1_0FuncFuzzer"/>
- <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>
- <option name="test-case-path" value="vts/testcases/fuzz/template/func_fuzzer_test/func_fuzzer_test"/>
- <option name="test-timeout" value="3h"/>
- </test>
-</configuration>
diff --git a/script/config/config_gen.py b/script/config/config_gen.py
index 3a67119..be6517f 100644
--- a/script/config/config_gen.py
+++ b/script/config/config_gen.py
@@ -63,7 +63,6 @@
self._utils.RemoveFilesInDirIf(
config_dir, lambda x: x == 'AndroidTest.xml' or 'Android.mk')
- self.UpdateFuzzerConfigsForType(FuzzerType.FUNC_FUZZER)
self.UpdateFuzzerConfigsForType(FuzzerType.IFACE_FUZZER)
def UpdateFuzzerConfigsForType(self, fuzzer_type):