DO NOT MERGE Fix build.

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index cb55a9cfd4d688ff9974460b0e4b61927f12964c..5b8866901e033b7408be4250796871ef9f3890ea 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \
        StringPool.cpp \
        XMLNode.cpp \
        ResourceFilter.cpp \
        StringPool.cpp \
        XMLNode.cpp \
        ResourceFilter.cpp \

+       ResourceIdCache.cpp \

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


@@ -29,8 +30,11 @@ 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/zlib
 LOCAL_C_INCLUDES += build/libs/host/include
 LOCAL_C_INCLUDES += external/libpng
 LOCAL_C_INCLUDES += external/zlib
 LOCAL_C_INCLUDES += build/libs/host/include


@@ -38,6 +42,7 @@ 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 \
        libutils \
        libcutils \
        libexpat \