am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"

* commit '8ac188ff0e739ea75ea02166c54428245200f088':
  Consistent use of USE_MINGW
This commit is contained in:
Ying Wang
2014-08-08 03:26:07 +00:00
committed by Android Git Automerger
5 changed files with 5 additions and 5 deletions

View File

@@ -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