commit 5af80aa11953a39532042192bbbb76e68ce66fcf
author Ian Rogers <irogers@google.com> Tue Jun 17 01:50:25 2014 -0700
committer Ian Rogers <irogers@google.com> Tue Jun 17 01:50:25 2014 -0700
tree c40f20a06eb8841f9a21a2734ee0704bb1fce60c
parent 7fa1cd19638c8ada0786e03abe50b5fe9b9f4270

Enable host multilib for ART testing.

Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 9882e31..2f55645 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -18,6 +18,7 @@
 
 LOCAL_MODULE := $(module)
 LOCAL_MODULE_TAGS := $(module_tag)
+LOCAL_MULTILIB := $($(module)_multilib)
 
 LOCAL_ADDITIONAL_DEPENDENCIES := \
     $(LOCAL_PATH)/Android.mk \

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 74bae1a..1de81e7 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -113,7 +113,9 @@
 build_target := SHARED_LIBRARY
 include $(LOCAL_PATH)/Android.build.mk
 build_type := host
+libbacktrace_libc++_multilib := both
 include $(LOCAL_PATH)/Android.build.mk
+libbacktrace_libc++_multilib :=
 endif
 
 #-------------------------------------------------------------------------