diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:21:32 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-23 15:30:42 -0700 |
| commit | 29355534384ee24bfe9a3bc97d7664dbe478b4fb (patch) | |
| tree | 6a34b62d8a06cbbb4fb608a522593354d9ab9f60 /tools | |
| parent | 85a8dcec5460edda72e9917d4f02ad1b6a133251 (diff) | |
| download | frameworks_base-29355534384ee24bfe9a3bc97d7664dbe478b4fb.zip frameworks_base-29355534384ee24bfe9a3bc97d7664dbe478b4fb.tar.gz frameworks_base-29355534384ee24bfe9a3bc97d7664dbe478b4fb.tar.bz2 | |
Fix aapt to build in Windows SDK under Linux
(Merge master Change Ic4a7b9e4)
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 |