commit 91c73f6c51bd279e494730012a8e7d5eff5cdf4f
author Ian Rogers <irogers@google.com> Wed Jun 25 10:15:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 25 10:15:34 2014 +0000
tree 3ca3c6dab5369186eac2491aeb6edd8cf7abb239
parent 42552bc66043fdd5d2bf2340e00b4c1fc0938049
parent 38dda3b8887286c44964dda0ce1c96425d9744f0

am 38dda3b8: am c309b97e: am e4022279: Merge "libbacktrace_libc++ needs to be multilib on the Mac too."

* commit '38dda3b8887286c44964dda0ce1c96425d9744f0':
  libbacktrace_libc++ needs to be multilib on the Mac too.

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 1de81e7..c321369 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -201,6 +201,8 @@
 LOCAL_SRC_FILES := \
 	BacktraceMap.cpp \
 
+LOCAL_MULTILIB := both
+
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 endif # TARGET_BUILD_APPS