update_makefiles.py benchmarks/msgq->tests/msgq
Test: mmma test/vts-testcase/fuzz
Change-Id: If5a4a8cfc2fd94b343280cfac76c762e3a30236e
diff --git a/func_fuzzer/benchmarks/Android.bp b/func_fuzzer/benchmarks/Android.bp
deleted file mode 100644
index ecbf9af..0000000
--- a/func_fuzzer/benchmarks/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 = [
- "msgq/V1_0",
-]
diff --git a/func_fuzzer/benchmarks/msgq/V1_0/Android.bp b/func_fuzzer/benchmarks/msgq/V1_0/Android.bp
deleted file mode 100644
index 2640603..0000000
--- a/func_fuzzer/benchmarks/msgq/V1_0/Android.bp
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-// Do not edit manually.
-genrule {
- name: "android.hardware.benchmarks.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.benchmarks.msgq@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/benchmarks/msgq/1.0/ $(genDir)/android/hardware/benchmarks/msgq/1.0/",
- srcs: [
- ":android.hardware.benchmarks.msgq@1.0_hal",
- ],
- out: [
- "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQ.vts.cpp",
- ],
-}
-
-cc_binary {
- name: "android.hardware.benchmarks.msgq@1.0-vts.func_fuzzer.BenchmarkMsgQ",
- srcs: [":android.hardware.benchmarks.msgq@1.0-vts.func_fuzzer.BenchmarkMsgQ_genc++"],
- include_dirs: [
- "external/llvm/lib/Fuzzer",
- "test/vts-testcase/fuzz/func_fuzzer/utils",
- ],
- shared_libs: [
- "android.hardware.benchmarks.msgq@1.0",
- "libcutils",
- "liblog",
- "libutils",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libhardware",
- "libvts_func_fuzzer_utils",
- ],
- static_libs: ["libLLVMFuzzer"],
- 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
index ef1c3c1..eb55d1a 100644
--- a/func_fuzzer/tests/msgq/V1_0/Android.bp
+++ b/func_fuzzer/tests/msgq/V1_0/Android.bp
@@ -1,6 +1,43 @@
// 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",
+ srcs: [":android.hardware.tests.msgq@1.0-vts.func_fuzzer.BenchmarkMsgQ_genc++"],
+ include_dirs: [
+ "external/llvm/lib/Fuzzer",
+ "test/vts-testcase/fuzz/func_fuzzer/utils",
+ ],
+ shared_libs: [
+ "android.hardware.tests.msgq@1.0",
+ "libcutils",
+ "liblog",
+ "libutils",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libhardware",
+ "libvts_func_fuzzer_utils",
+ ],
+ static_libs: ["libLLVMFuzzer"],
+ 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/",
