summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-08-29 23:49:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 23:49:42 +0000
commitb15b08cc0eb47560d25a2b70f892a248a0652bc2 (patch)
treef256dd0c922b047865fbc9b3d55a23bf26340df1
parent3c7c11e468715fb6c607f8fcab798bd94917568e (diff)
parent6441455e365064bdeba3c8154430a068881d4a63 (diff)
downloadandroid_external_elfutils-b15b08cc0eb47560d25a2b70f892a248a0652bc2.tar.gz
android_external_elfutils-b15b08cc0eb47560d25a2b70f892a248a0652bc2.tar.bz2
android_external_elfutils-b15b08cc0eb47560d25a2b70f892a248a0652bc2.zip
am 6441455e: Merge "Disable Clang for all elfutils libraries."
* commit '6441455e365064bdeba3c8154430a068881d4a63': Disable Clang for all elfutils libraries.
-rwxr-xr-x0.153/libdw/Android.mk9
-rwxr-xr-x0.153/libdwfl/Android.mk9
-rwxr-xr-x0.153/libebl/Android.mk6
-rwxr-xr-x0.153/libelf/Android.mk9
4 files changed, 24 insertions, 9 deletions
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
index 52a0923f..0ec30dde 100755
--- a/0.153/libdw/Android.mk
+++ b/0.153/libdw/Android.mk
@@ -124,6 +124,9 @@ ifeq ($(HOST_OS),linux)
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_C_INCLUDES := \
$(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 @@ endif # linux
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 6d283848..84e789c4 100755
--- a/0.153/libdwfl/Android.mk
+++ b/0.153/libdwfl/Android.mk
@@ -48,6 +48,9 @@ ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -65,9 +68,6 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
# 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 @@ endif # linux
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 08dab038..58b6d0d6 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -68,6 +68,9 @@ ifeq ($(HOST_OS),linux)
#
include $(CLEAR_VARS)
+# Disable clang like other elfutils libraries.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -98,6 +101,9 @@ endif # linux
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 2a733a5b..e1a76cf5 100755
--- a/0.153/libelf/Android.mk
+++ b/0.153/libelf/Android.mk
@@ -133,6 +133,9 @@ ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
LOCAL_C_INCLUDES := \
@@ -147,9 +150,6 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
# 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 @@ endif # linux
include $(CLEAR_VARS)
+# Clang has no nested functions.
+LOCAL_CLANG := false
+
LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
LOCAL_C_INCLUDES := \