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

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 094b7db3b4c4c9cd7f9b46a165c4718b25fb87da..eeddd4b0a5b6b06ad9d8482b0626b46ac41a710f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -13,10 +13,13 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        AaptAssets.cpp \
        Command.cpp \
 LOCAL_SRC_FILES := \
        AaptAssets.cpp \
        Command.cpp \

+       CrunchCache.cpp \
+       FileFinder.cpp \

        Main.cpp \
        Package.cpp \
        StringPool.cpp \
        XMLNode.cpp \
        Main.cpp \
        Package.cpp \
        StringPool.cpp \
        XMLNode.cpp \

+       ResourceFilter.cpp \

        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \


@@ -26,6 +29,10 @@ LOCAL_SRC_FILES := \
 
 
 LOCAL_CFLAGS += -Wno-format-y2k
 
 
 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
 
 LOCAL_C_INCLUDES += external/expat/lib
 LOCAL_C_INCLUDES += external/libpng


@@ -41,7 +48,7 @@ LOCAL_STATIC_LIBRARIES := \
        libpng
 
 ifeq ($(HOST_OS),linux)
        libpng
 
 ifeq ($(HOST_OS),linux)

-LOCAL_LDLIBS += -lrt -lpthread
+LOCAL_LDLIBS += -lrt -ldl -lpthread

 endif
 
 # Statically link libz for MinGW (Win SDK under Linux),
 endif
 
 # Statically link libz for MinGW (Win SDK under Linux),