Build 32/64 bit versions of tests/benchmarks.
Change-Id: I4d146377aac6573a214dfaa5cab5cce8b10538b4
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 33e0a0b..5a53685 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -18,6 +18,11 @@
LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag)
+LOCAL_MULTILIB := $(multilib)
+ifeq ($(multilib),both)
+ LOCAL_MODULE_STEM_32 := $(module)32
+ LOCAL_MODULE_STEM_64 := $(module)64
+endif
LOCAL_CLANG := $($(module)_clang_$(build_type))