commit 925a3279b7f6abab30ef34e8caa2951f5fdc5613
author Raphael <raphael@google.com> Wed Apr 14 12:19:12 2010 -0700
committer Raphael <raphael@google.com> Tue Apr 20 15:46:54 2010 -0700
tree 66544f89d7f37fa4a82f8b718e709445a9da7a1c
parent 155afe393faa0aae47d517fa687a7e4ab3cae91b

Make zipalign build for the Win SDK under Linux.

Change-Id: Ibd667437d6637fbc5b21147f57eb41e81cbd8577

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