am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependenc...

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 2d8973d89b72848752c8945bbc19540b554cefa6..e507fb908c3bddc9c1d703456e0bf08393cb30f2 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,12 +4,17 @@
 # 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 \
+       CrunchCache.cpp \
+       FileFinder.cpp \
        Main.cpp \
        Package.cpp \
        StringPool.cpp \
@@ -37,19 +42,20 @@ LOCAL_STATIC_LIBRARIES := \
        libexpat \
        libpng
 
-LOCAL_LDLIBS := -lz
-
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS += -lrt -lpthread
 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 # TARGET_BUILD_APPS