From feefeb4f308261907f5ea5705d66736d45633a27 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Fri, 3 Apr 2015 12:44:40 -0700
Subject: [PATCH] AAPT2 statically link libz on Windows builds

Change-Id: I2abf47273173c470c04e00a54aa619fe1ce0e745
---
 tools/aapt2/Android.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index e61fd29fc220f..9cea17646bc68 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -70,8 +70,8 @@ testSources := \
 	XmlFlattener_test.cpp
 
 cIncludes :=
+hostLdLibs :=
 
-hostLdLibs := -lz
 hostStaticLibs := \
 	libandroidfw \
 	libutils \
@@ -80,6 +80,12 @@ hostStaticLibs := \
 	libexpat \
 	libziparchive-host
 
+ifneq ($(strip $(USE_MINGW)),)
+	hostStaticLibs += libz
+else
+	hostLdLibs += -lz
+endif
+
 cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG
 cppFlags := -std=c++11 -Wno-missing-field-initializers