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

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

Browse Source 
Merge commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken

* commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f':
  Fix aapt to build in Windows SDK under Linux
This commit is contained in:
Raphael
2010-04-23 17:19:35 -07:00
committed by Android Git Automerger
parent 3c8c69198e 7fca18d4ea
commit 917204631d
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 \
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