am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index fdc859c01c4d08d798580f23777de6c069f86e34..499a7aca59323ff47a72c2724f28d12a20dea09c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,10 @@ LOCAL_SRC_FILES := \
        ResourceTable.cpp \
        Images.cpp \
        Resource.cpp \
-    SourcePos.cpp
+    SourcePos.cpp \
+    ZipEntry.cpp \
+    ZipFile.cpp
+
 
 LOCAL_CFLAGS += -Wno-format-y2k
 
@@ -34,16 +37,16 @@ LOCAL_STATIC_LIBRARIES := \
        libexpat \
        libpng
 
-LOCAL_LDLIBS := -lz
-
 ifeq ($(HOST_OS),linux)
 LOCAL_LDLIBS += -lrt
 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