commit 46d8d6f3e8dea49245df862507a5f368fd6c8f4b
author Hridya Valsaraju <hridya@google.com> Mon Feb 13 11:01:05 2017 -0800
committer Hridya Valsaraju <hridya@google.com> Thu Feb 16 21:35:21 2017 +0000
tree 24f57dc6db0db8c4a3291fd2c016bfef5034ea8e
parent 43d5251d4dea9401cd646d6d3b8fd529ae647622

Build both 32 and 64 bit versions of FMQ test server

Test: Ran both 32 and 64-bit FMQ unit tests.

Bug: 33467211
Change-Id: I0d82484e3d4234e1d939458c1f7f1a80adbc7346

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 2e61d15..ab9d450 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -31,6 +31,11 @@
     libfmq
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SHARED_LIBRARIES += android.hardware.tests.msgq@1.0
+
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)