summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-06-24 21:39:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-24 21:39:17 +0000
commitab3233befb8381bd1a15f81f3261fa81dd55f297 (patch)
tree665e80ef815c18402538da3a8c5d0e1e59dd5d33
parent676880b973daa4f0b214b51596e138a3702e5f17 (diff)
parent6aa751752e36c570415919990d1ca35d564f09b9 (diff)
downloadextras-ab3233befb8381bd1a15f81f3261fa81dd55f297.tar.gz
am 6aa75175: Merge "Create 32 bit and 64 bit versions of exes."
* commit '6aa751752e36c570415919990d1ca35d564f09b9': Create 32 bit and 64 bit versions of exes.
-rw-r--r--micro_bench/Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/micro_bench/Android.mk b/micro_bench/Android.mk
index c5be5f7a..df540702 100644
--- a/micro_bench/Android.mk
+++ b/micro_bench/Android.mk
@@ -7,6 +7,9 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE := micro_bench
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
@@ -19,4 +22,7 @@ LOCAL_MODULE := micro_bench_static
LOCAL_STATIC_LIBRARIES = libc libm
LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
include $(BUILD_EXECUTABLE)