diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 9882e31164cb2dcf01d09af3265ef2817e32e1ef..2f556453327c95a94817f431225c23a63fd8bb53 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 74bae1ae7d36ca4d95e89b08ae422eac572cec1d..1de81e7df58b5ae4dfafaae6d668100d9fd85f14 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 1d48fea820466c85b39bb31f1f130e7075379ec0..705caa5a1266fd36d5fc9202f9d56ef2a61db658 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)