p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 4c70244c: Make zipalign build for the Win SDK under Linux. 

Merge commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0' into froyo-plus-aosp

* commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0':
  Make zipalign build for the Win SDK under Linux.
This commit is contained in:
Raphael 2010-04-23 17:14:58 -07:00 committed by Android Git Automerger
parent 55f1fca10e 4c70244cb1
commit 575cf4dc5e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/zipalign/Android.mk
View File

@ -18,17 +18,14 @@ LOCAL_STATIC_LIBRARIES := \
libutils \ libutils \
libcutils libcutils
LOCAL_LDLIBS := -lz
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt LOCAL_LDLIBS += -lrt
endif endif
# dunno if we need this, but some of the other tools include it ifneq ($(strip $(USE_MINGW)),)
ifeq ($(HOST_OS),windows) LOCAL_STATIC_LIBRARIES += libz
ifeq ($(strip $(USE_CYGWIN),),) else
LOCAL_LDLIBS += -lws2_32 LOCAL_LDLIBS += -lz
endif
endif endif
LOCAL_MODULE := zipalign LOCAL_MODULE := zipalign