Revert "Move android.hardware.benchmarks into android.hardware.tests"
This reverts commit c8f7d73720f783532ad0ef243b6593e97e6d5edc.
Change-Id: I957cd686468aa618014a95c0510b162956df9bf7
diff --git a/benchmarks/Android.bp b/benchmarks/Android.bp
new file mode 100644
index 0000000..ab0f308
--- /dev/null
+++ b/benchmarks/Android.bp
@@ -0,0 +1,4 @@
+// This is an autogenerated file, do not edit.
+subdirs = [
+ "msgq/1.0",
+]
diff --git a/benchmarks/msgq/1.0/Android.bp b/benchmarks/msgq/1.0/Android.bp
new file mode 100644
index 0000000..7f8ea99
--- /dev/null
+++ b/benchmarks/msgq/1.0/Android.bp
@@ -0,0 +1,59 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.benchmarks.msgq@1.0_hal",
+ srcs: [
+ "IBenchmarkMsgQ.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.benchmarks.msgq@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0",
+ srcs: [
+ ":android.hardware.benchmarks.msgq@1.0_hal",
+ ],
+ out: [
+ "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.benchmarks.msgq@1.0_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0",
+ srcs: [
+ ":android.hardware.benchmarks.msgq@1.0_hal",
+ ],
+ out: [
+ "android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h",
+ "android/hardware/benchmarks/msgq/1.0/IHwBenchmarkMsgQ.h",
+ "android/hardware/benchmarks/msgq/1.0/BnHwBenchmarkMsgQ.h",
+ "android/hardware/benchmarks/msgq/1.0/BpHwBenchmarkMsgQ.h",
+ "android/hardware/benchmarks/msgq/1.0/BsBenchmarkMsgQ.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.benchmarks.msgq@1.0",
+ generated_sources: ["android.hardware.benchmarks.msgq@1.0_genc++"],
+ generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
diff --git a/tests/msgq/1.0/IBenchmarkMsgQ.hal b/benchmarks/msgq/1.0/IBenchmarkMsgQ.hal
similarity index 98%
rename from tests/msgq/1.0/IBenchmarkMsgQ.hal
rename to benchmarks/msgq/1.0/IBenchmarkMsgQ.hal
index 81754a4..c4b9d95 100644
--- a/tests/msgq/1.0/IBenchmarkMsgQ.hal
+++ b/benchmarks/msgq/1.0/IBenchmarkMsgQ.hal
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.hardware.tests.msgq@1.0;
+package android.hardware.benchmarks.msgq@1.0;
interface IBenchmarkMsgQ {
/*
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index 2d42699..d17efe4 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -3,7 +3,6 @@
filegroup {
name: "android.hardware.tests.msgq@1.0_hal",
srcs: [
- "IBenchmarkMsgQ.hal",
"ITestMsgQ.hal",
],
}
@@ -16,7 +15,6 @@
":android.hardware.tests.msgq@1.0_hal",
],
out: [
- "android/hardware/tests/msgq/1.0/BenchmarkMsgQAll.cpp",
"android/hardware/tests/msgq/1.0/TestMsgQAll.cpp",
],
}
@@ -29,11 +27,6 @@
":android.hardware.tests.msgq@1.0_hal",
],
out: [
- "android/hardware/tests/msgq/1.0/IBenchmarkMsgQ.h",
- "android/hardware/tests/msgq/1.0/IHwBenchmarkMsgQ.h",
- "android/hardware/tests/msgq/1.0/BnHwBenchmarkMsgQ.h",
- "android/hardware/tests/msgq/1.0/BpHwBenchmarkMsgQ.h",
- "android/hardware/tests/msgq/1.0/BsBenchmarkMsgQ.h",
"android/hardware/tests/msgq/1.0/ITestMsgQ.h",
"android/hardware/tests/msgq/1.0/IHwTestMsgQ.h",
"android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h",