commit bec9990f589ec73ea1eb46bf8faf551dc6da4dde
author Steve Fung <stevefung@google.com> Mon Nov 02 20:30:51 2015 -0800
committer Steve Fung <stevefung@google.com> Tue Nov 03 04:59:00 2015 +0000
tree c64932972195d31e64e35096f0ac9ca59c5123c7
parent f462addf63ad4dcab1d31ec898d1def4e91fa60e

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

Android.mk

diff --git a/Android.mk b/Android.mk
index f899fe0..a3cc6fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,12 @@
 
 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_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)