diff options
Diffstat (limited to 'libbacktrace/Android.build.mk')
| -rw-r--r-- | libbacktrace/Android.build.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 3c80cc2..7e1cd53 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 \ @@ -60,14 +61,16 @@ LOCAL_LDLIBS := \ $($(module)_ldlibs_$(build_type)) \ ifeq ($(build_type),target) - include external/stlport/libstlport.mk - include $(BUILD_$(build_target)) endif ifeq ($(build_type),host) # Only build if host builds are supported. ifeq ($(build_host),true) + LOCAL_CFLAGS += -Wno-extern-c-compat + ifneq ($($(module)_libc++),) + include external/libcxx/libcxx.mk + endif include $(BUILD_HOST_$(build_target)) endif endif |