am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index e507fb908c3bddc9c1d703456e0bf08393cb30f2..482f43e1270c291504efd255af63faae2d038741 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES := \
        Package.cpp \
        StringPool.cpp \
        XMLNode.cpp \
        Package.cpp \
        StringPool.cpp \
        XMLNode.cpp \

+       ResourceFilter.cpp \

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


@@ -28,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


@@ -37,13 +42,14 @@ LOCAL_C_INCLUDES += build/libs/host/include
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \

+       libandroidfw \

        libutils \
        libcutils \
        libexpat \
        libpng
 
 ifeq ($(HOST_OS),linux)
        libutils \
        libcutils \
        libexpat \
        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),