commit 38dda3b8887286c44964dda0ce1c96425d9744f0
author Ian Rogers <irogers@google.com> Wed Jun 25 09:56:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 25 09:56:12 2014 +0000
tree 29adf74a36422b02c8d253bdf830c62c60f2a627
parent 9eb6e1bcbc54f4e2c4317a0c997e0623091ddece
parent c309b97eb1dd689e0e15afa067640391bd2430b3

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

* commit 'c309b97eb1dd689e0e15afa067640391bd2430b3':
  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