hidl_test(_java) require dependency.
hidl_test(_java) runs cross 32 + 64-bit tests. Modifying required
statements to require exactly what is needed.
Bug: 7456955
Test: build time errors gone, hidl_test + hidl_test_java
Change-Id: I4e60efbe018fdf0f9a8fc9713c07ce7d97ce0769
diff --git a/test/hidl_test/Android.mk b/test/hidl_test/Android.mk
index 43d7102..f328223 100644
--- a/test/hidl_test/Android.mk
+++ b/test/hidl_test/Android.mk
@@ -25,12 +25,15 @@
LOCAL_MODULE := hidl_test
LOCAL_MODULE_CLASS := NATIVE_TESTS
LOCAL_SRC_FILES := hidl_test
-LOCAL_REQUIRED_MODULES := \
- hidl_test_client \
- hidl_test_servers \
- hidl_test_client_32 \
- hidl_test_servers_32 \
- hidl_test_helper
+
+LOCAL_REQUIRED_MODULES := \
+ hidl_test_client \
+ hidl_test_helper \
+ hidl_test_servers
+
+LOCAL_REQUIRED_MODULES_arm64 := hidl_test_servers_32 hidl_test_client_32
+LOCAL_REQUIRED_MODULES_mips64 := hidl_test_servers_32 hidl_test_client_32
+LOCAL_REQUIRED_MODULES_x86_64 := hidl_test_servers_32 hidl_test_client_32
include $(BUILD_PREBUILT)
diff --git a/test/java_test/Android.mk b/test/java_test/Android.mk
index 90a2a4a..a41fa5d 100644
--- a/test/java_test/Android.mk
+++ b/test/java_test/Android.mk
@@ -24,9 +24,12 @@
LOCAL_REQUIRED_MODULES := \
hidl_test_java_lib \
hidl_test_java_native \
- hidl_test_java_native_32 \
android.hidl.base-V1.0-java \
android.hidl.manager-V1.0-java \
android.hardware.tests.baz-V1.0-java
+LOCAL_REQUIRED_MODULES_arm64 := hidl_test_java_native_32
+LOCAL_REQUIRED_MODULES_x86_64 := hidl_test_java_native_32
+LOCAL_REQUIRED_MODULES_mips64 := hidl_test_java_native_32
+
include $(BUILD_PREBUILT)