Merge "Enable host multilib for ART testing."
This commit is contained in:
commit
4dfe6faa93
3 changed files with 4 additions and 0 deletions
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue