diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:21:32 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-26 14:25:19 -0700 |
| commit | ec82e5aa79f639ec6b19d6bda341e210a636e9b1 (patch) | |
| tree | 1136e9890ad98ddada19af8c2eb9b1822e34b5de | |
| parent | 89e544dae58f43317379c15834452449345df913 (diff) | |
| download | base-ec82e5aa79f639ec6b19d6bda341e210a636e9b1.tar.gz | |
Fix aapt to build in Windows SDK under Linux
(Merge master Change Ic4a7b9e4)
Change-Id: Iea7a944a4b897fe8cc077164d0fe4d6f16fe1a57
| -rw-r--r-- | tools/aapt/Android.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 2d8973d89b72..499a7aca5932 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 |