commit 4dfe6faa932e255413dc4dbbaada7e19dd01efd4
author Ian Rogers <irogers@google.com> Tue Jun 17 18:42:04 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 17 03:56:33 2014 +0000
tree 92b377155f16c490967d74d24f630aec8b8b08a7
parent 2af91ffb6c5f93ecbc322183c755bb249edc2488
parent 5af80aa11953a39532042192bbbb76e68ce66fcf

Merge "Enable host multilib for ART testing."

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
 
 #-------------------------------------------------------------------------

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 1d48fea..705caa5 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -42,6 +42,7 @@
 LOCAL_STATIC_LIBRARIES := libz libutils
 LOCAL_MODULE:= libziparchive-host
 LOCAL_CFLAGS := -Werror
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)