aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Fung <stevefung@google.com>2015-11-02 20:30:51 -0800
committerSteve Fung <stevefung@google.com>2015-11-03 04:59:00 +0000
commitbec9990f589ec73ea1eb46bf8faf551dc6da4dde (patch)
treec64932972195d31e64e35096f0ac9ca59c5123c7
parentf462addf63ad4dcab1d31ec898d1def4e91fa60e (diff)
downloadgoogle-breakpad-bec9990f589ec73ea1eb46bf8faf551dc6da4dde.tar.gz
Do not use clang to build x86
When core2md is built with clang, it segfaults when trying to allocate memory pages. Temporarily build without clang for x86 until b/25435766 is fixed. Bug: 25374681 Change-Id: I408afed876b8a9a0314db2cb7a8a3d433ec2aa04
-rw-r--r--Android.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f899fe0b..a3cc6fab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,12 @@ LOCAL_C_INCLUDES := \
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
+ifeq ($(TARGET_ARCH),x86)
+# Temporarily build without clang, until b/25435766 fixes core2md segfault.
+LOCAL_CLANG := false
+else
LOCAL_CLANG := true
+endif
include $(BUILD_STATIC_LIBRARY)
@@ -64,7 +69,12 @@ LOCAL_SRC_FILES := src/tools/linux/core2md/core2md.cc
LOCAL_STATIC_LIBRARIES := breakpad_client
+ifeq ($(TARGET_ARCH),x86)
+# Temporarily build without clang, until b/25435766 fixes core2md segfault.
+LOCAL_CLANG := false
+else
LOCAL_CLANG := true
+endif
include $(BUILD_EXECUTABLE)