Merge "Build overlay packages just like regular packages."

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 2d8973d89b72848752c8945bbc19540b554cefa6..cb55a9cfd4d688ff9974460b0e4b61927f12964c 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 \


@@ -37,19 +43,20 @@ LOCAL_STATIC_LIBRARIES := \
        libexpat \
        libpng
 
        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