diff options
| author | Raphael <raphael@google.com> | 2010-04-14 12:19:12 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-20 15:46:54 -0700 |
| commit | 925a3279b7f6abab30ef34e8caa2951f5fdc5613 (patch) | |
| tree | 66544f89d7f37fa4a82f8b718e709445a9da7a1c /tools/zipalign | |
| parent | 155afe393faa0aae47d517fa687a7e4ab3cae91b (diff) | |
| download | build-925a3279b7f6abab30ef34e8caa2951f5fdc5613.zip build-925a3279b7f6abab30ef34e8caa2951f5fdc5613.tar.gz build-925a3279b7f6abab30ef34e8caa2951f5fdc5613.tar.bz2 | |
Make zipalign build for the Win SDK under Linux.
Change-Id: Ibd667437d6637fbc5b21147f57eb41e81cbd8577
Diffstat (limited to 'tools/zipalign')
| -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 |