From 4c70244cb1af8b2babd7750c2bd19aeb722e19e0 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Wed, 14 Apr 2010 12:19:12 -0700
Subject: [PATCH] Make zipalign build for the Win SDK under Linux.

(Merge master Change Ibd667437)
---
 tools/zipalign/Android.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index f90a31c1d..9763bd2ca 100644
--- a/tools/zipalign/Android.mk
+++ b/tools/zipalign/Android.mk
@@ -18,17 +18,14 @@ LOCAL_STATIC_LIBRARIES := \
 	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