commit 6d7b4b11cb52ebb5f8f947706c88e9f3f3ba5d62
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 03 18:03:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 03 18:03:43 2016 +0000
tree d5702cf534eacb694238cd9f82f6c896f228ddaa
parent a4b53d0da8c1c6889c361fd30b913adc364163bc
parent 0752ad5df9ccdda06af7abbe71385420b6913e7c

Merge "Add hidl_test_java dependencies in build system."

test/java_test/Android.mk

diff --git a/test/java_test/Android.mk b/test/java_test/Android.mk
index 233030a..4641ce0 100644
--- a/test/java_test/Android.mk
+++ b/test/java_test/Android.mk
@@ -5,10 +5,10 @@
 LOCAL_MODULE := hidl_test_java_lib
 LOCAL_MODULE_STEM := hidl_test_java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_JAVA_LIBRARIES := 			   \
-	android.hardware.tests.baz@1.0-java	   \
-	android.hardware.tests.expression@1.0-java \
-	android.hardware.tests.inheritance@1.0-java
+LOCAL_JAVA_LIBRARIES :=                         \
+    android.hardware.tests.baz@1.0-java         \
+    android.hardware.tests.expression@1.0-java  \
+    android.hardware.tests.inheritance@1.0-java
 
 include $(BUILD_JAVA_LIBRARY)
 
@@ -19,6 +19,10 @@
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := hidl_test_java
 
+LOCAL_ADDITIONAL_DEPENDENCIES :=                \
+    hidl_test_java_lib                          \
+    hidl_test_java_native
+
 LOCAL_REQUIRED_MODULES :=                       \
     hidl_test_java_lib                          \
     android.hardware.tests.baz@1.0-java
@@ -33,12 +37,12 @@
 
 LOCAL_SRC_FILES := hidl_test_java_native.cpp
 
-LOCAL_SHARED_LIBRARIES :=           \
-    libbase                         \
-    libhidl                         \
-    libhwbinder                     \
-    libutils                        \
-    android.hardware.tests.baz@1.0  \
+LOCAL_SHARED_LIBRARIES :=                 \
+    libbase                               \
+    libhidl                               \
+    libhwbinder                           \
+    libutils                              \
+    android.hardware.tests.baz@1.0        \
     android.hardware.tests.expression@1.0 \
     android.hardware.tests.inheritance@1.0