From 594a10ae77d7f359b4bc3fa80c10f6944021bcd4 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Thu, 7 Aug 2014 20:08:04 -0700
Subject: [PATCH] Consistent use of USE_MINGW

Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
---
 core/binary.mk                    | 2 +-
 core/combo/HOST_windows-x86.mk    | 2 +-
 core/combo/HOST_windows-x86_64.mk | 2 +-
 core/envsetup.mk                  | 2 +-
 tools/zipalign/Android.mk         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/binary.mk b/core/binary.mk
index bda9f2e218..df176f19dc 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -116,7 +116,7 @@ my_generated_sources := $(LOCAL_GENERATED_SOURCES)
 # MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because
 # all code is position independent, and then those warnings get promoted to
 # errors.
-ifeq ($(strip $(USE_MINGW)),)
+ifndef USE_MINGW
 ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
 my_cflags += -fpie
 else
diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk
index 4d871d879d..766c14a3d1 100644
--- a/core/combo/HOST_windows-x86.mk
+++ b/core/combo/HOST_windows-x86.mk
@@ -24,7 +24,7 @@ TOOLS_EXE_SUFFIX := .exe
 
 # Settings to use MinGW has a cross-compiler under Linux
 ifneq ($(findstring Linux,$(UNAME)),)
-ifneq ($(strip $(USE_MINGW)),)
+ifdef USE_MINGW
 HOST_ACP_UNAVAILABLE := true
 TOOLS_EXE_SUFFIX :=
 $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DUSE_MINGW
diff --git a/core/combo/HOST_windows-x86_64.mk b/core/combo/HOST_windows-x86_64.mk
index c77d82caa5..bd392ea1a6 100644
--- a/core/combo/HOST_windows-x86_64.mk
+++ b/core/combo/HOST_windows-x86_64.mk
@@ -24,7 +24,7 @@ TOOLS_EXE_SUFFIX := .exe
 
 # Settings to use MinGW has a cross-compiler under Linux
 ifneq ($(findstring Linux,$(UNAME)),)
-ifneq ($(strip $(USE_MINGW)),)
+ifdef USE_MINGW
 HOST_ACP_UNAVAILABLE := true
 TOOLS_EXE_SUFFIX :=
 HOST_GLOBAL_CFLAGS += -DUSE_MINGW
diff --git a/core/envsetup.mk b/core/envsetup.mk
index d0b58465ee..87371b9e28 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -58,7 +58,7 @@ BUILD_OS := $(HOST_OS)
 # Under Linux, if USE_MINGW is set, we change HOST_OS to Windows to build the
 # Windows SDK. Only a subset of tools and SDK will manage to build properly.
 ifeq ($(HOST_OS),linux)
-ifneq ($(USE_MINGW),)
+ifdef USE_MINGW
   HOST_OS := windows
 endif
 endif
diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index 708c8bf92b..49f9043e40 100644
--- a/tools/zipalign/Android.mk
+++ b/tools/zipalign/Android.mk
@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),linux)
 LOCAL_LDLIBS += -lrt
 endif
 
-ifneq ($(strip $(USE_MINGW)),)
+ifdef USE_MINGW
 LOCAL_STATIC_LIBRARIES += libz
 else
 LOCAL_LDLIBS += -lz