Fix etc1tool to build in Windows SDK under Linux
(Merges master Change Ib38a019b + Change I50f55004)
Change-Id: I2cbb63f0f20cdd2652b6b64ae0dee4343b952973
diff --git a/tools/etc1tool/Android.mk b/tools/etc1tool/Android.mk
index 5536158..a66af25 100644
--- a/tools/etc1tool/Android.mk
+++ b/tools/etc1tool/Android.mk
@@ -23,16 +23,16 @@
libpng \
libETC1
-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 := etc1tool