Update makefiles for clang host builds. DO NOT MERGE
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
index 1d053f6..111ed6c 100755
--- a/0.153/libdw/Android.mk
+++ b/0.153/libdw/Android.mk
@@ -139,6 +139,9 @@
LOCAL_CFLAGS += -fnested-functions
endif
+# can't build libdw with clang
+LOCAL_CLANG := false
+
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE -DIS_LIBDW
diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk
index 1157314..4e486ed 100755
--- a/0.153/libdwfl/Android.mk
+++ b/0.153/libdwfl/Android.mk
@@ -67,6 +67,9 @@
LOCAL_CFLAGS += -fnested-functions
endif
+# libdwfl is one of the few libs that will never compile with clang
+LOCAL_CLANG := false
+
# to fix machine-dependent issues
LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index 945ecf4..224c797 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -85,6 +85,10 @@
LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
+ifeq ($(HOST_OS),darwin)
+LOCAL_CFLAGS += -Wno-int-conversion
+endif
+
LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
LOCAL_MODULE:= libebl
diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk
index b85e20c..9dd1b39 100755
--- a/0.153/libelf/Android.mk
+++ b/0.153/libelf/Android.mk
@@ -154,6 +154,9 @@
LOCAL_CFLAGS += -fnested-functions
endif
+# can't build libelf with clang
+LOCAL_CLANG := false
+
# to fix machine-dependent issues
LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h