commit 5666791b3030bd6b143e57ef940aeadf541f2a03
author Steven Moreland <smoreland@google.com> Wed Apr 11 18:22:17 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 11 18:22:17 2018 -0700
tree eaf86f812de3c5f59d4a12007254de50b7129fe6
parent 93a6e39a2b8997574b11d9532ae3ce425c766fc3
parent e0b63fc47b3cdaa6bc44e9b7363c7825fe794039

mq_benchmark_client/fmq_test deps TARGET_2ND_ARCH am: 76d547d1be
am: e0b63fc47b

Change-Id: Ia70433c06b8aa8615dfa8ff669366d27eab0a1d3

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)