Merge "Updated makefiles (includes java-library rules for applicable packages)."

diff --cc tests/bar/1.0/Android.mk
Simple merge

diff --cc tests/baz/1.0/Android.mk
index 41287d0,dc25f6a..4aaade8
--- 1/tests/baz/1.0/Android.mk
--- 2/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@@ -66,4 -66,68 +66,66 @@@ LOCAL_SHARED_LIBRARIES := 
    libutils \
  
  LOCAL_MULTILIB := both
 -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 --cc tests/expression/1.0/Android.mk
index b27e29d,5b713e4..137aaf8
--- 1/tests/expression/1.0/Android.mk
--- 2/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@@ -32,4 -32,34 +32,32 @@@ LOCAL_SHARED_LIBRARIES := 
    libutils \
  
  LOCAL_MULTILIB := both
 -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 --cc tests/foo/1.0/Android.mk
Simple merge

diff --cc tests/libhwbinder/1.0/Android.mk
index c87a266,b065e8d..079f484
--- 1/tests/libhwbinder/1.0/Android.mk
--- 2/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@@ -32,4 -32,34 +32,32 @@@ LOCAL_SHARED_LIBRARIES := 
    libutils \
  
  LOCAL_MULTILIB := both
 -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 --cc tests/msgq/1.0/Android.mk
Simple merge