summaryrefslogtreecommitdiffstats
path: root/libbacktrace
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-17 01:50:25 -0700
committerIan Rogers <irogers@google.com>2014-06-17 01:50:25 -0700
commit5af80aa11953a39532042192bbbb76e68ce66fcf (patch)
treec40f20a06eb8841f9a21a2734ee0704bb1fce60c /libbacktrace
parent7fa1cd19638c8ada0786e03abe50b5fe9b9f4270 (diff)
downloadsystem_core-5af80aa11953a39532042192bbbb76e68ce66fcf.zip
system_core-5af80aa11953a39532042192bbbb76e68ce66fcf.tar.gz
system_core-5af80aa11953a39532042192bbbb76e68ce66fcf.tar.bz2
Enable host multilib for ART testing.
Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/Android.build.mk1
-rwxr-xr-xlibbacktrace/Android.mk2
2 files changed, 3 insertions, 0 deletions
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 @@ include $(CLEAR_VARS)
LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag)
+LOCAL_MULTILIB := $($(module)_multilib)
LOCAL_ADDITIONAL_DEPENDENCIES := \
$(LOCAL_PATH)/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_type := target
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
#-------------------------------------------------------------------------