Merge "AAPT2 statically link libz on Windows builds"

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