diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
new file mode 100644
index 0000000..16454ec
--- /dev/null
+++ b/tests/msgq/1.0/Android.bp
@@ -0,0 +1,42 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.msgq@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.msgq@1.0",
+    srcs: [
+        "ITestMsgQ.hal",
+    ],
+    out: [
+        "android/hardware/tests/msgq/1.0/TestMsgQAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.msgq@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.msgq@1.0",
+    srcs: [
+        "ITestMsgQ.hal",
+    ],
+    out: [
+        "android/hardware/tests/msgq/1.0/ITestMsgQ.h",
+        "android/hardware/tests/msgq/1.0/IHwTestMsgQ.h",
+        "android/hardware/tests/msgq/1.0/BnTestMsgQ.h",
+        "android/hardware/tests/msgq/1.0/BpTestMsgQ.h",
+        "android/hardware/tests/msgq/1.0/BsTestMsgQ.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.msgq@1.0",
+    generated_sources: ["android.hardware.tests.msgq@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+    ],
+}
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
deleted file mode 100644
index 2cde5bf..0000000
--- a/tests/msgq/1.0/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.msgq@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build ITestMsgQ.hal
-#
-GEN := $(intermediates)/android/hardware/tests/msgq/1.0/TestMsgQAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ITestMsgQ.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.msgq@1.0::ITestMsgQ
-
-$(GEN): $(LOCAL_PATH)/ITestMsgQ.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
-LOCAL_SHARED_LIBRARIES := \
-    libhidl \
-    libhwbinder \
-    libutils \
-    libcutils \
-
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(call all-makefiles-under,$(LOCAL_PATH))