diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index 6d33182..1bd500b 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -18,8 +18,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.bar@1.0::IBar
 
 $(GEN): $(LOCAL_PATH)/IBar.hal
 	$(transform-generated-source)
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index 5f669ac..dc25f6a 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -18,8 +18,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.baz@1.0::IBase
 
 $(GEN): $(LOCAL_PATH)/IBase.hal
 	$(transform-generated-source)
@@ -35,8 +35,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.baz@1.0::IBaz
 
 $(GEN): $(LOCAL_PATH)/IBaz.hal
 	$(transform-generated-source)
@@ -52,8 +52,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.baz@1.0::IBazCallback
 
 $(GEN): $(LOCAL_PATH)/IBazCallback.hal
 	$(transform-generated-source)
@@ -69,3 +69,65 @@
 LOCAL_COMPATIBILITY_SUITE := vts
 -include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.baz@1.0-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+#
+# Build IBase.hal
+#
+GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
+$(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) \
+    -Ljava -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/IBaz.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+    -Ljava -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/IBazCallback.java
+$(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) \
+    -Ljava -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.baz@1.0::IBazCallback
+
+$(GEN): $(LOCAL_PATH)/IBazCallback.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 1ea1c5a..5b713e4 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -18,8 +18,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.expression@1.0::IExpression
 
 $(GEN): $(LOCAL_PATH)/IExpression.hal
 	$(transform-generated-source)
@@ -35,3 +35,31 @@
 LOCAL_COMPATIBILITY_SUITE := vts
 -include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.expression@1.0-java
+LOCAL_MODULE_CLASS := JAVA_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/IExpression.java
+$(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) \
+    -Ljava -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.expression@1.0::IExpression
+
+$(GEN): $(LOCAL_PATH)/IExpression.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 0758b3d..6f302e7 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -9,19 +9,19 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 #
-# Build types.hal
+# Build IFoo.hal
 #
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
+GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.foo@1.0::IFoo
 
-$(GEN): $(LOCAL_PATH)/types.hal
+$(GEN): $(LOCAL_PATH)/IFoo.hal
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
@@ -35,27 +35,27 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.foo@1.0::IFooCallback
 
 $(GEN): $(LOCAL_PATH)/IFooCallback.hal
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 #
-# Build IFoo.hal
+# Build types.hal
 #
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp
+GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.foo@1.0::types
 
-$(GEN): $(LOCAL_PATH)/IFoo.hal
+$(GEN): $(LOCAL_PATH)/types.hal
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index ebbe3da..b065e8d 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -18,8 +18,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.libhwbinder@1.0::IBenchmark
 
 $(GEN): $(LOCAL_PATH)/IBenchmark.hal
 	$(transform-generated-source)
@@ -35,3 +35,31 @@
 LOCAL_COMPATIBILITY_SUITE := vts
 -include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0-java
+LOCAL_MODULE_CLASS := JAVA_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/IBenchmark.java
+$(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) \
+    -Ljava -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.libhwbinder@1.0::IBenchmark
+
+$(GEN): $(LOCAL_PATH)/IBenchmark.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index e2f29bd..ed5bf14 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -18,8 +18,8 @@
 $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.msgq@1.0::ITestMsgQ
 
 $(GEN): $(LOCAL_PATH)/ITestMsgQ.hal
 	$(transform-generated-source)