Merge "Populate ucontext_t#fpregs_mem when getting the context"
diff --git a/Android.mk b/Android.mk
index 5b3c64c..6f94bb1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,9 +21,6 @@
ifeq ($(HOST_ARCH),$(filter $(HOST_ARCH),x86 x86_64))
build_host := true
my_host_arch := $(HOST_ARCH)
-ifneq ($(strip $(BUILD_HOST_64bit)),)
-my_host_arch := x86_64
-endif
endif
endif
@@ -46,6 +43,11 @@
common_cflags_target := \
-Wno-maybe-uninitialized \
+ifeq ($(LOCAL_CLANG),true)
+# src/mi/backtrace.c is misdetected as a bogus header guard by clang 3.5
+common_cflags += -Wno-header-guard
+endif
+
ifneq ($(debug),true)
common_cflags += \
-DHAVE_CONFIG_H \
