commit 76d547d1be0fdcd099327c0d824aa173f25b9d65
author Steven Moreland <smoreland@google.com> Wed Apr 11 14:14:28 2018 -0700
committer Steven Moreland <smoreland@google.com> Wed Apr 11 15:04:29 2018 -0700
tree 501f9ee69a92a2f2030a80081db8ccfc1da07f8f
parent a7d46a97d3c1f2fb7828d77fc003a6c202baa114

mq_benchmark_client/fmq_test deps TARGET_2ND_ARCH

Specifying required dependencies exactly using
TARGET_2ND_ARCH. Before, using
LOCAL_REQUIRED_MODULES_<arch> broke down on archs
which only have 64-bit.

Bug: 7456955
Test: mq_benchmark_client/fmq_test

Change-Id: If0c08646086d4cbe7bf88e45e76e653c459b3192

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 3f481cb..6b94f04 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -30,9 +30,11 @@
     libhidlbase \
     libhidltransport
 
-LOCAL_REQUIRED_MODULES := \
-    android.hardware.tests.msgq@1.0-impl_32 \
-    android.hardware.tests.msgq@1.0-impl
+LOCAL_REQUIRED_MODULES := android.hardware.tests.msgq@1.0-impl
+
+ifneq ($(TARGET_2ND_ARCH),)
+LOCAL_REQUIRED_MODULES += android.hardware.tests.msgq@1.0-impl$(TARGET_2ND_ARCH_MODULE_SUFFIX)
+endif
 
 LOCAL_SHARED_LIBRARIES += android.hardware.tests.msgq@1.0 libfmq
 LOCAL_MODULE := mq_benchmark_client

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 36258d9..1d246a4 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,9 +24,10 @@
     android.hardware.tests.msgq@1.0-service-test    \
     hidl_test_helper
 
-LOCAL_REQUIRED_MODULES_arm64 := android.hardware.tests.msgq@1.0-service-test_32 mq_test_client_32
-LOCAL_REQUIRED_MODULES_mips64 := android.hardware.tests.msgq@1.0-service-test_32 mq_test_client_32
-LOCAL_REQUIRED_MODULES_x86_64 := android.hardware.tests.msgq@1.0-service-test_32 mq_test_client_32
+ifneq ($(TARGET_2ND_ARCH),)
+LOCAL_REQUIRED_MODULES += android.hardware.tests.msgq@1.0-service-test$(TARGET_2ND_ARCH_MODULE_SUFFIX)
+LOCAL_REQUIRED_MODULES += mq_test_client$(TARGET_2ND_ARCH_MODULE_SUFFIX)
+endif
 
 include $(BUILD_PREBUILT)