am 31820a35: Merge "Add --output-text-symbols option to aapt."

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index cb55a9cfd4d688ff9974460b0e4b61927f12964c..d9b06815bf658607637b87b062968fd93c190790 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -29,8 +29,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 +41,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 \