diff options
| author | Ying Wang <wangying@google.com> | 2014-08-08 03:26:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-08 03:26:07 +0000 |
| commit | 5a5d443f156fb61a365773d617e5d2747eeea26d (patch) | |
| tree | 2761f05599d3cb22ac3e6edd1978fa3bf556cfb2 /tools/zipalign | |
| parent | 493c61af6a6d877b4e0ab6b6a385b665b3bc81a7 (diff) | |
| parent | 8ac188ff0e739ea75ea02166c54428245200f088 (diff) | |
| download | build-5a5d443f156fb61a365773d617e5d2747eeea26d.zip build-5a5d443f156fb61a365773d617e5d2747eeea26d.tar.gz build-5a5d443f156fb61a365773d617e5d2747eeea26d.tar.bz2 | |
am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
Consistent use of USE_MINGW
Diffstat (limited to 'tools/zipalign')
| -rw-r--r-- | tools/zipalign/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk index 7986798..4194f81 100644 --- a/tools/zipalign/Android.mk +++ b/tools/zipalign/Android.mk @@ -26,7 +26,7 @@ ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt endif -ifneq ($(strip $(USE_MINGW)),) +ifdef USE_MINGW LOCAL_STATIC_LIBRARIES += libz else LOCAL_LDLIBS += -lz |