diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-22 04:41:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-22 04:41:47 +0000 |
| commit | f73f8d6e844c98a03e43a826ce7a5b430b0a22db (patch) | |
| tree | d901d561f21e0970c62dadb80943853a61d6a3ad | |
| parent | 99892e508851006cc8b12790ee55c643be70369e (diff) | |
| parent | d9b7f696a4c63387d40f9833a56a3a77a9a9216f (diff) | |
| download | android_external_elfutils-f73f8d6e844c98a03e43a826ce7a5b430b0a22db.tar.gz android_external_elfutils-f73f8d6e844c98a03e43a826ce7a5b430b0a22db.tar.bz2 android_external_elfutils-f73f8d6e844c98a03e43a826ce7a5b430b0a22db.zip | |
Merge "Stop breaking the Darwin build."
| -rwxr-xr-x | 0.153/libdw/Android.mk | 6 | ||||
| -rwxr-xr-x | 0.153/libdwfl/Android.mk | 6 | ||||
| -rwxr-xr-x | 0.153/libebl/Android.mk | 6 | ||||
| -rwxr-xr-x | 0.153/libelf/Android.mk | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk index 111ed6c6..f9c02af3 100755 --- a/0.153/libdw/Android.mk +++ b/0.153/libdw/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -135,10 +135,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../libdw \ $(LOCAL_PATH)/../libelf -ifeq ($(HOST_OS),darwin) - LOCAL_CFLAGS += -fnested-functions -endif - # can't build libdw with clang LOCAL_CLANG := false diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk index 9d313aa0..46f3b380 100755 --- a/0.153/libdwfl/Android.mk +++ b/0.153/libdwfl/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -68,10 +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 -ifeq ($(HOST_OS),darwin) - LOCAL_CFLAGS += -fnested-functions -endif - # libdwfl is one of the few libs that will never compile with clang LOCAL_CLANG := false diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk index 224c7970..5af01f9b 100755 --- a/0.153/libebl/Android.mk +++ b/0.153/libebl/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -85,10 +85,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup 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 9dd1b396..76052435 100755 --- a/0.153/libelf/Android.mk +++ b/0.153/libelf/Android.mk @@ -14,7 +14,7 @@ LOCAL_PATH := $(call my-dir) -supported_platforms := linux darwin +supported_platforms := linux cur_platform := $(filter $(HOST_OS),$(supported_platforms)) ifdef cur_platform @@ -150,10 +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 -ifeq ($(HOST_OS),darwin) - LOCAL_CFLAGS += -fnested-functions -endif - # can't build libelf with clang LOCAL_CLANG := false |