commit 164f83e5eb4a3b9d39041df3888e59dcf5db3b65
author Andreas Huber <andih@google.com> Thu Jan 05 17:20:45 2017 -0800
committer Andreas Huber <andih@google.com> Thu Jan 12 09:24:32 2017 -0800
tree f231f2caded84ba67c94f1749c8c437d1c74c195
parent 805ab52a99f79de30b1e246e5f9c7ed85648fb25

Test Java functionality with native client/servers in all supported ABIs

(32- and 64-bit for now)

Test: hidl_test_java
Change-Id: I338ad0ebd60f39e2b52055f050b44f08aa207322

test/java_test/Android.mk

diff --git a/test/java_test/Android.mk b/test/java_test/Android.mk
index ea8eebb..efe4558 100644
--- a/test/java_test/Android.mk
+++ b/test/java_test/Android.mk
@@ -22,7 +22,7 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES :=                \
     hidl_test_java_lib                          \
-    hidl_test_java_native
+    hidl_test_java_native                       \
 
 LOCAL_REQUIRED_MODULES :=                       \
     hidl_test_java_lib                          \
@@ -30,26 +30,3 @@
     android.hardware.tests.baz@1.0-java
 
 include $(BUILD_PREBUILT)
-
-################################################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := hidl_test_java_native
-
-LOCAL_SRC_FILES := hidl_test_java_native.cpp
-
-LOCAL_SHARED_LIBRARIES :=                 \
-    libbase                               \
-    libhidlbase                           \
-    libhidltransport                      \
-    libhwbinder                           \
-    libutils                              \
-    android.hardware.tests.baz@1.0        \
-    android.hardware.tests.expression@1.0 \
-    android.hardware.tests.inheritance@1.0
-
-LOCAL_STATIC_LIBRARIES := \
-    libgtest
-
-include $(BUILD_EXECUTABLE)