diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
new file mode 100644
index 0000000..b879741
--- /dev/null
+++ b/tests/bar/1.0/Android.bp
@@ -0,0 +1,43 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.bar@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.bar@1.0",
+    srcs: [
+        "IBar.hal",
+    ],
+    out: [
+        "android/hardware/tests/bar/1.0/BarAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.bar@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.bar@1.0",
+    srcs: [
+        "IBar.hal",
+    ],
+    out: [
+        "android/hardware/tests/bar/1.0/IBar.h",
+        "android/hardware/tests/bar/1.0/IHwBar.h",
+        "android/hardware/tests/bar/1.0/BnBar.h",
+        "android/hardware/tests/bar/1.0/BpBar.h",
+        "android/hardware/tests/bar/1.0/BsBar.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.bar@1.0",
+    generated_sources: ["android.hardware.tests.bar@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+        "android.hardware.tests.foo@1.0",
+    ],
+}
diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
deleted file mode 100644
index ef278ae..0000000
--- a/tests/bar/1.0/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.bar@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build IBar.hal
-#
-GEN := $(intermediates)/android/hardware/tests/bar/1.0/BarAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.bar@1.0::IBar
-
-$(GEN): $(LOCAL_PATH)/IBar.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
-LOCAL_SHARED_LIBRARIES := \
-    libhidl \
-    libhwbinder \
-    libutils \
-    libcutils \
-    android.hardware.tests.foo@1.0 \
-
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
new file mode 100644
index 0000000..d3eefe5
--- /dev/null
+++ b/tests/baz/1.0/Android.bp
@@ -0,0 +1,62 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.baz@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.baz@1.0",
+    srcs: [
+        "types.hal",
+        "IBase.hal",
+        "IBaz.hal",
+        "IBazCallback.hal",
+    ],
+    out: [
+        "android/hardware/tests/baz/1.0/types.cpp",
+        "android/hardware/tests/baz/1.0/BaseAll.cpp",
+        "android/hardware/tests/baz/1.0/BazAll.cpp",
+        "android/hardware/tests/baz/1.0/BazCallbackAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.baz@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.baz@1.0",
+    srcs: [
+        "types.hal",
+        "IBase.hal",
+        "IBaz.hal",
+        "IBazCallback.hal",
+    ],
+    out: [
+        "android/hardware/tests/baz/1.0/types.h",
+        "android/hardware/tests/baz/1.0/IBase.h",
+        "android/hardware/tests/baz/1.0/IHwBase.h",
+        "android/hardware/tests/baz/1.0/BnBase.h",
+        "android/hardware/tests/baz/1.0/BpBase.h",
+        "android/hardware/tests/baz/1.0/BsBase.h",
+        "android/hardware/tests/baz/1.0/IBaz.h",
+        "android/hardware/tests/baz/1.0/IHwBaz.h",
+        "android/hardware/tests/baz/1.0/BnBaz.h",
+        "android/hardware/tests/baz/1.0/BpBaz.h",
+        "android/hardware/tests/baz/1.0/BsBaz.h",
+        "android/hardware/tests/baz/1.0/IBazCallback.h",
+        "android/hardware/tests/baz/1.0/IHwBazCallback.h",
+        "android/hardware/tests/baz/1.0/BnBazCallback.h",
+        "android/hardware/tests/baz/1.0/BpBazCallback.h",
+        "android/hardware/tests/baz/1.0/BsBazCallback.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.baz@1.0",
+    generated_sources: ["android.hardware.tests.baz@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+    ],
+}
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index 56e2ea9..f75f2ff 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -1,94 +1,6 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.baz@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build types.hal
-#
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/types.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.baz@1.0::types
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IBase.hal
-#
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.baz@1.0::IBase
-
-$(GEN): $(LOCAL_PATH)/IBase.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IBaz.hal
-#
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
-$(GEN): $(LOCAL_PATH)/IBase.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
-$(GEN): $(LOCAL_PATH)/IBazCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.baz@1.0::IBaz
-
-$(GEN): $(LOCAL_PATH)/IBaz.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IBazCallback.hal
-#
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazCallbackAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.baz@1.0::IBazCallback
-
-$(GEN): $(LOCAL_PATH)/IBazCallback.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)
 
 ################################################################################
 
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
new file mode 100644
index 0000000..32d4682
--- /dev/null
+++ b/tests/expression/1.0/Android.bp
@@ -0,0 +1,50 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.expression@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.expression@1.0",
+    srcs: [
+        "IExpression.hal",
+        "IExpressionExt.hal",
+    ],
+    out: [
+        "android/hardware/tests/expression/1.0/ExpressionAll.cpp",
+        "android/hardware/tests/expression/1.0/ExpressionExtAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.expression@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.expression@1.0",
+    srcs: [
+        "IExpression.hal",
+        "IExpressionExt.hal",
+    ],
+    out: [
+        "android/hardware/tests/expression/1.0/IExpression.h",
+        "android/hardware/tests/expression/1.0/IHwExpression.h",
+        "android/hardware/tests/expression/1.0/BnExpression.h",
+        "android/hardware/tests/expression/1.0/BpExpression.h",
+        "android/hardware/tests/expression/1.0/BsExpression.h",
+        "android/hardware/tests/expression/1.0/IExpressionExt.h",
+        "android/hardware/tests/expression/1.0/IHwExpressionExt.h",
+        "android/hardware/tests/expression/1.0/BnExpressionExt.h",
+        "android/hardware/tests/expression/1.0/BpExpressionExt.h",
+        "android/hardware/tests/expression/1.0/BsExpressionExt.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.expression@1.0",
+    generated_sources: ["android.hardware.tests.expression@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+    ],
+}
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 804af71..dbb97dc 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -1,58 +1,6 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.expression@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build IExpression.hal
-#
-GEN := $(intermediates)/android/hardware/tests/expression/1.0/ExpressionAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.expression@1.0::IExpression
-
-$(GEN): $(LOCAL_PATH)/IExpression.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IExpressionExt.hal
-#
-GEN := $(intermediates)/android/hardware/tests/expression/1.0/ExpressionExtAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IExpression.hal
-$(GEN): $(LOCAL_PATH)/IExpression.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.expression@1.0::IExpressionExt
-
-$(GEN): $(LOCAL_PATH)/IExpressionExt.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)
 
 ################################################################################
 
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
new file mode 100644
index 0000000..4896fc3
--- /dev/null
+++ b/tests/foo/1.0/Android.bp
@@ -0,0 +1,54 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.foo@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.foo@1.0",
+    srcs: [
+        "types.hal",
+        "IFoo.hal",
+        "IFooCallback.hal",
+    ],
+    out: [
+        "android/hardware/tests/foo/1.0/types.cpp",
+        "android/hardware/tests/foo/1.0/FooAll.cpp",
+        "android/hardware/tests/foo/1.0/FooCallbackAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.foo@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.foo@1.0",
+    srcs: [
+        "types.hal",
+        "IFoo.hal",
+        "IFooCallback.hal",
+    ],
+    out: [
+        "android/hardware/tests/foo/1.0/types.h",
+        "android/hardware/tests/foo/1.0/IFoo.h",
+        "android/hardware/tests/foo/1.0/IHwFoo.h",
+        "android/hardware/tests/foo/1.0/BnFoo.h",
+        "android/hardware/tests/foo/1.0/BpFoo.h",
+        "android/hardware/tests/foo/1.0/BsFoo.h",
+        "android/hardware/tests/foo/1.0/IFooCallback.h",
+        "android/hardware/tests/foo/1.0/IHwFooCallback.h",
+        "android/hardware/tests/foo/1.0/BnFooCallback.h",
+        "android/hardware/tests/foo/1.0/BpFooCallback.h",
+        "android/hardware/tests/foo/1.0/BsFooCallback.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.foo@1.0",
+    generated_sources: ["android.hardware.tests.foo@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+    ],
+}
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
deleted file mode 100644
index ee503ef..0000000
--- a/tests/foo/1.0/Android.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.foo@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build types.hal
-#
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.foo@1.0::types
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IFoo.hal
-#
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IFooCallback.hal
-$(GEN): $(LOCAL_PATH)/IFooCallback.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.foo@1.0::IFoo
-
-$(GEN): $(LOCAL_PATH)/IFoo.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IFooCallback.hal
-#
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.foo@1.0::IFooCallback
-
-$(GEN): $(LOCAL_PATH)/IFooCallback.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))
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
new file mode 100644
index 0000000..508de22
--- /dev/null
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -0,0 +1,42 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.libhwbinder@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0",
+    srcs: [
+        "IBenchmark.hal",
+    ],
+    out: [
+        "android/hardware/tests/libhwbinder/1.0/BenchmarkAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.libhwbinder@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0",
+    srcs: [
+        "IBenchmark.hal",
+    ],
+    out: [
+        "android/hardware/tests/libhwbinder/1.0/IBenchmark.h",
+        "android/hardware/tests/libhwbinder/1.0/IHwBenchmark.h",
+        "android/hardware/tests/libhwbinder/1.0/BnBenchmark.h",
+        "android/hardware/tests/libhwbinder/1.0/BpBenchmark.h",
+        "android/hardware/tests/libhwbinder/1.0/BsBenchmark.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.libhwbinder@1.0",
+    generated_sources: ["android.hardware.tests.libhwbinder@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+    ],
+}
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index 61349af..c7b9409 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -1,39 +1,6 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build IBenchmark.hal
-#
-GEN := $(intermediates)/android/hardware/tests/libhwbinder/1.0/BenchmarkAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Lc++ -randroid.hardware:hardware/interfaces \
-        android.hardware.tests.libhwbinder@1.0::IBenchmark
-
-$(GEN): $(LOCAL_PATH)/IBenchmark.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)
 
 ################################################################################
 
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))
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
new file mode 100644
index 0000000..45659d7
--- /dev/null
+++ b/tests/pointer/1.0/Android.bp
@@ -0,0 +1,50 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.tests.pointer@1.0_genc++",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.pointer@1.0",
+    srcs: [
+        "IGraph.hal",
+        "IPointer.hal",
+    ],
+    out: [
+        "android/hardware/tests/pointer/1.0/GraphAll.cpp",
+        "android/hardware/tests/pointer/1.0/PointerAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.tests.pointer@1.0_genc++_headers",
+    tool: "hidl-gen",
+    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.pointer@1.0",
+    srcs: [
+        "IGraph.hal",
+        "IPointer.hal",
+    ],
+    out: [
+        "android/hardware/tests/pointer/1.0/IGraph.h",
+        "android/hardware/tests/pointer/1.0/IHwGraph.h",
+        "android/hardware/tests/pointer/1.0/BnGraph.h",
+        "android/hardware/tests/pointer/1.0/BpGraph.h",
+        "android/hardware/tests/pointer/1.0/BsGraph.h",
+        "android/hardware/tests/pointer/1.0/IPointer.h",
+        "android/hardware/tests/pointer/1.0/IHwPointer.h",
+        "android/hardware/tests/pointer/1.0/BnPointer.h",
+        "android/hardware/tests/pointer/1.0/BpPointer.h",
+        "android/hardware/tests/pointer/1.0/BsPointer.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.tests.pointer@1.0",
+    generated_sources: ["android.hardware.tests.pointer@1.0_genc++"],
+    generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidl",
+        "libhwbinder",
+        "libutils",
+        "libcutils",
+    ],
+}
diff --git a/tests/pointer/1.0/Android.mk b/tests/pointer/1.0/Android.mk
deleted file mode 100644
index d1c23bf..0000000
--- a/tests/pointer/1.0/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.tests.pointer@1.0
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-#
-# Build IGraph.hal
-#
-GEN := $(intermediates)/android/hardware/tests/pointer/1.0/GraphAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGraph.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-    -Lc++ -randroid.hardware:hardware/interfaces \
-    android.hardware.tests.pointer@1.0::IGraph
-
-$(GEN): $(LOCAL_PATH)/IGraph.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IPointer.hal
-#
-GEN := $(intermediates)/android/hardware/tests/pointer/1.0/PointerAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IPointer.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-    -Lc++ -randroid.hardware:hardware/interfaces \
-    android.hardware.tests.pointer@1.0::IPointer
-
-$(GEN): $(LOCAL_PATH)/IPointer.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)