Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dbbb159 authored Aug 08, 2014 by Ying Wang Committed by Gerrit Code Review Aug 07, 2014

Merge "Consistent use of USE_MINGW"

parents 76c942c1 594a10ae

core/binary.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

core/combo/HOST_windows-x86.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

core/combo/HOST_windows-x86_64.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

core/envsetup.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

tools/zipalign/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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