commit 31a4f6ff4c5d19d806b5703cd36723ae355b050f
author Raphael <raphael@google.com> Fri Apr 23 17:21:45 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 23 17:21:45 2010 -0700
tree bc93b7242ba2df0fa88b9bf40d33a0982fcd8d19
parent 19ca463e8750207f51f927789780ecba6d6914d4
parent 575cf4dc5e7d290858b1c11f4195694888a8164c

am 575cf4dc: am 4c70244c: Make zipalign build for the Win SDK under Linux.

Merge commit '575cf4dc5e7d290858b1c11f4195694888a8164c' into kraken

* commit '575cf4dc5e7d290858b1c11f4195694888a8164c':
  Make zipalign build for the Win SDK under Linux.

tools/zipalign/Android.mk

diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index f90a31c..9763bd2 100644
--- a/tools/zipalign/Android.mk
+++ b/tools/zipalign/Android.mk
@@ -18,17 +18,14 @@
 	libutils \
 	libcutils
 
-LOCAL_LDLIBS := -lz
-
 ifeq ($(HOST_OS),linux)
 LOCAL_LDLIBS += -lrt
 endif
 
-# dunno if we need this, but some of the other tools include it
-ifeq ($(HOST_OS),windows)
-ifeq ($(strip $(USE_CYGWIN),),)
-LOCAL_LDLIBS += -lws2_32
-endif
+ifneq ($(strip $(USE_MINGW)),)
+LOCAL_STATIC_LIBRARIES += libz
+else
+LOCAL_LDLIBS += -lz
 endif
 
 LOCAL_MODULE := zipalign