From 5af80aa11953a39532042192bbbb76e68ce66fcf Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 17 Jun 2014 01:50:25 -0700 Subject: Enable host multilib for ART testing. Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c --- libbacktrace/Android.build.mk | 1 + libbacktrace/Android.mk | 2 ++ libziparchive/Android.mk | 1 + 3 files changed, 4 insertions(+) diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 9882e3116..2f5564533 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 74bae1ae7..1de81e7df 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 #------------------------------------------------------------------------- diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 1d48fea82..705caa5a1 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -42,6 +42,7 @@ LOCAL_C_INCLUDES += ${includes} LOCAL_STATIC_LIBRARIES := libz libutils LOCAL_MODULE:= libziparchive-host LOCAL_CFLAGS := -Werror +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -- cgit v1.2.3