Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 29355534: Fix aapt to build in Windows SDK under Linux

Browse Source 
Merge commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp

* commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb':
  Fix aapt to build in Windows SDK under Linux
This commit is contained in:
Raphael
2010-04-23 17:14:21 -07:00
committed by Android Git Automerger
parent bd17156fda 2935553438
commit 7fca18d4ea
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/aapt/Android.mk
View File

@@ -37,16 +37,16 @@ LOCAL_STATIC_LIBRARIES := \
libexpat \ libexpat \
libpng libpng
LOCAL_LDLIBS := -lz
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt LOCAL_LDLIBS += -lrt
endif endif
ifeq ($(HOST_OS),windows) # Statically link libz for MinGW (Win SDK under Linux),
ifeq ($(strip $(USE_CYGWIN),),) # and dynamically link for all others.
LOCAL_LDLIBS += -lws2_32 ifneq ($(strip $(USE_MINGW)),)
endif LOCAL_STATIC_LIBRARIES += libz
else
LOCAL_LDLIBS += -lz
endif endif
LOCAL_MODULE := aapt LOCAL_MODULE := aapt