From 29355534384ee24bfe9a3bc97d7664dbe478b4fb Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Tue, 13 Apr 2010 15:21:32 -0700
Subject: [PATCH] Fix aapt to build in Windows SDK under Linux

(Merge master Change Ic4a7b9e4)
---
 tools/aapt/Android.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 2d8973d89b728..499a7aca59323 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -37,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