commit b0578273a576d83728787091519237681e7197c6
author Elliott Hughes <enh@google.com> Fri Aug 22 05:02:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 22 05:02:10 2014 +0000
tree 04829429a311f33aa2adab5902fc1df8a6bf0d8b
parent a0d3fb656d2dfc9d8d6f3749855baf4424ffd094
parent f73f8d6e844c98a03e43a826ce7a5b430b0a22db

am f73f8d6e: Merge "Stop breaking the Darwin build."

* commit 'f73f8d6e844c98a03e43a826ce7a5b430b0a22db':
  Stop breaking the Darwin build.

0.153/libdw/Android.mk

diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
index 111ed6c..f9c02af 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_PATH)/../libdw \
 	$(LOCAL_PATH)/../libelf
 
-ifeq ($(HOST_OS),darwin)
-	LOCAL_CFLAGS += -fnested-functions
-endif
-
 # can't build libdw with clang
 LOCAL_CLANG := false
 

0.153/libdwfl/Android.mk

diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk
index 9d313aa..46f3b38 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 @@
 # 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
 

0.153/libebl/Android.mk

diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index 85a88d0..b1c9004 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

0.153/libelf/Android.mk

diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk
index 9dd1b39..7605243 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 @@
 # 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