From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 6 Jun 2012 01:48:00 +0000 (-0700)
Subject: am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/b49089aea6e889e9215661aab9022bbdb671f015?hp=-c

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.
---

b49089aea6e889e9215661aab9022bbdb671f015
diff --combined Android.mk
index d0a81dc,eeddd4b..482f43e
--- a/Android.mk
+++ b/Android.mk
@@@ -29,6 -29,10 +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
@@@ -38,7 -42,6 +42,7 @@@ LOCAL_C_INCLUDES += build/libs/host/inc
  #LOCAL_WHOLE_STATIC_LIBRARIES := 
  LOCAL_STATIC_LIBRARIES := \
  	libhost \
 +	libandroidfw \
  	libutils \
  	libcutils \
  	libexpat \