diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:21:32 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-16 17:59:09 -0700 |
| commit | 69df817eea480e360e5c4f1d1f29ea7c2ce3a025 (patch) | |
| tree | 87cf0de7caa972c19ef16251a6ce01d8549ebbf1 /tools | |
| parent | 5a2e428ce8ce6d7f13a8b6caf90534a4ca794e9f (diff) | |
| download | frameworks_base-69df817eea480e360e5c4f1d1f29ea7c2ce3a025.zip frameworks_base-69df817eea480e360e5c4f1d1f29ea7c2ce3a025.tar.gz frameworks_base-69df817eea480e360e5c4f1d1f29ea7c2ce3a025.tar.bz2 | |
Fix aapt to build in Windows SDK under Linux
Change-Id: Ic4a7b9e4df5b32bc338547a2a9d09b834ebaff14
Diffstat (limited to 'tools')
| -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 2d8973d..499a7ac 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 |