Updated makefiles (includes java-library rules for applicable packages).
Change-Id: I178faf37dddb5149c1bdc217fa1395b2566194d7
Bug: 31221188
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)