diff options
| author | Raphael <raphael@google.com> | 2010-04-14 12:19:12 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-23 13:15:37 -0700 |
| commit | 4c70244cb1af8b2babd7750c2bd19aeb722e19e0 (patch) | |
| tree | c9d0e8ae4010528afcde81103c564b489d915350 /tools | |
| parent | d72731d213269f63f2bb80631f02914800f556ad (diff) | |
| download | build-4c70244cb1af8b2babd7750c2bd19aeb722e19e0.zip build-4c70244cb1af8b2babd7750c2bd19aeb722e19e0.tar.gz build-4c70244cb1af8b2babd7750c2bd19aeb722e19e0.tar.bz2 | |
Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/zipalign/Android.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk index f90a31c..9763bd2 100644 --- a/tools/zipalign/Android.mk +++ b/tools/zipalign/Android.mk @@ -18,17 +18,14 @@ LOCAL_STATIC_LIBRARIES := \ libutils \ libcutils -LOCAL_LDLIBS := -lz - ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt endif -# dunno if we need this, but some of the other tools include it -ifeq ($(HOST_OS),windows) -ifeq ($(strip $(USE_CYGWIN),),) -LOCAL_LDLIBS += -lws2_32 -endif +ifneq ($(strip $(USE_MINGW)),) +LOCAL_STATIC_LIBRARIES += libz +else +LOCAL_LDLIBS += -lz endif LOCAL_MODULE := zipalign |