Disable Clang for all elfutils libraries.
Three of them have nested functions and one has some
warning about K&R promoted parameter.
BUG: 17281788
Change-Id: I4ce397876af7c47153e27e11869a7659dbf1b3e3
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
index 52a0923..0ec30dd 100755
--- a/0.153/libdw/Android.mk
+++ b/0.153/libdw/Android.mk
@@ -124,6 +124,9 @@
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -132,9 +135,6 @@
$(LOCAL_PATH)/../libdw \
$(LOCAL_PATH)/../libelf
-# 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
@@ -157,6 +157,9 @@
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
LOCAL_C_INCLUDES := \
diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk
index 6d28384..84e789c 100755
--- a/0.153/libdwfl/Android.mk
+++ b/0.153/libdwfl/Android.mk
@@ -48,6 +48,9 @@
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -65,9 +68,6 @@
# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
LOCAL_CFLAGS += -Wno-pointer-arith
-# 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
@@ -83,6 +83,9 @@
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
LOCAL_C_INCLUDES := \
diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index 69ddaa5..7b4284d 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -68,6 +68,9 @@
#
include $(CLEAR_VARS)
+# Disable clang like other elfutils libraries.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -96,6 +99,9 @@
include $(CLEAR_VARS)
+# Disable clang like other elfutils libraries.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
LOCAL_C_INCLUDES := \
diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk
index 2a733a5..e1a76cf 100755
--- a/0.153/libelf/Android.mk
+++ b/0.153/libelf/Android.mk
@@ -133,6 +133,9 @@
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -147,9 +150,6 @@
# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
LOCAL_CFLAGS += -Wno-pointer-arith
-# 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
@@ -165,6 +165,9 @@
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
LOCAL_C_INCLUDES := \
