From: Raphael Date: Tue, 13 Apr 2010 22:21:32 +0000 (-0700) Subject: Fix aapt to build in Windows SDK under Linux X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/283c2c492c1b7eadaeeed6f38158752b0a77aff7 Fix aapt to build in Windows SDK under Linux (Merge master Change Ic4a7b9e4) --- diff --git a/Android.mk b/Android.mk index 2d8973d..499a7ac 100644 --- a/Android.mk +++ b/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