am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with...

* commit 'c9fe6568f3e7e4d9dc6da072afc929b9a81001ed':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.

diff --combined Android.mk
index d0a81dc1b1a8e5965d9f511a62ca617a1ccbe7ef,eeddd4b0a5b6b06ad9d8482b0626b46ac41a710f..482f43e1270c291504efd255af63faae2d038741
--- 1/Android.mk
--- 2/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 \