commit a7d46a97d3c1f2fb7828d77fc003a6c202baa114
author Steven Moreland <smoreland@google.com> Tue Feb 13 16:05:56 2018 -0800
committer Steven Moreland <smoreland@google.com> Wed Feb 14 00:11:08 2018 +0000
tree 1b3916953bb957f6ad04e8894db9682bddf3e08e
parent 6017fb99c582886be7f93ab85346fe4666b18c62

fmq_test require dependency.

fmq_test runs cross 32 + 64-bit tests. Modifying required
statements to require exactly what is needed.

Bug: 7456955
Test: build time errors gone, fmq_test
Change-Id: Idc5819281e1cc58b3d501aa01de31ac7efd7364a

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 718a33b..36258d9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -22,10 +22,12 @@
 LOCAL_REQUIRED_MODULES :=                           \
     mq_test_client                                  \
     android.hardware.tests.msgq@1.0-service-test    \
-    mq_test_client_32                               \
-    android.hardware.tests.msgq@1.0-service-test_32 \
     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
+
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)