am a2b978bc: Merge "Fix writing text version of styleable IDs. do not merge." into...

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 499a7aca59323ff47a72c2724f28d12a20dea09c..d9b06815bf658607637b87b062968fd93c190790 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,16 +4,22 @@
 # Android Asset Packaging Tool
 #
 
 # Android Asset Packaging Tool
 #
 

+# This tool is prebuilt if we're doing an app-only build.
+ifeq ($(TARGET_BUILD_APPS),)
+

 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
        AaptAssets.cpp \
        Command.cpp \
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 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 \


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


@@ -32,13 +41,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
+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),


@@ -53,3 +63,4 @@ LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 
 
 include $(BUILD_HOST_EXECUTABLE)
 

+endif # TARGET_BUILD_APPS