am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index fdc859c01c4d08d798580f23777de6c069f86e34..d9b06815bf658607637b87b062968fd93c190790 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,24 +4,36 @@
 # 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 \

-    SourcePos.cpp
+    SourcePos.cpp \
+    ZipEntry.cpp \
+    ZipFile.cpp
+

 
 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


@@ -29,24 +41,26 @@ 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
 
        libutils \
        libcutils \
        libexpat \
        libpng
 

-LOCAL_LDLIBS := -lz
-

 ifeq ($(HOST_OS),linux)
 ifeq ($(HOST_OS),linux)

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

 endif
 
 endif
 

-ifeq ($(HOST_OS),windows)
-ifeq ($(strip $(USE_CYGWIN),),)
-LOCAL_LDLIBS += -lws2_32
-endif
+# Statically link libz for MinGW (Win SDK under Linux),
+# and dynamically link for all others.
+ifneq ($(strip $(USE_MINGW)),)
+  LOCAL_STATIC_LIBRARIES += libz
+else
+  LOCAL_LDLIBS += -lz

 endif
 
 LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 
 endif
 
 LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 

+endif # TARGET_BUILD_APPS