summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-05 18:48:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-05 18:48:00 -0700
commitf22eb96301aa1c4e0f7ac317daa64a617c21855c (patch)
treed85eda22d166b57293c05ae2e916eb63352f5f24 /tools
parent4835c17b13c08693cf9a370df86d660818f8d391 (diff)
parentc9fe6568f3e7e4d9dc6da072afc929b9a81001ed (diff)
downloadframeworks_base-f22eb96301aa1c4e0f7ac317daa64a617c21855c.zip
frameworks_base-f22eb96301aa1c4e0f7ac317daa64a617c21855c.tar.gz
frameworks_base-f22eb96301aa1c4e0f7ac317daa64a617c21855c.tar.bz2
am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."
* commit 'c9fe6568f3e7e4d9dc6da072afc929b9a81001ed': Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index d0a81dc..482f43e 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -29,6 +29,10 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS += -Wno-format-y2k
+ifeq (darwin,$(HOST_OS))
+LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
+endif
+
LOCAL_C_INCLUDES += external/expat/lib
LOCAL_C_INCLUDES += external/libpng