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

Commit 145ae320 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove legacy windows platform build support 

We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.

Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
parent dae6455c

core/combo/HOST_windows-x86.mk

+2 −30
Original line number Diff line number Diff line
@@ -14,19 +14,10 @@ 
# limitations under the License.

#



# Configuration for Linux on x86.

# Settings to use MinGW as a cross-compiler under Linux

# Included by combo/select.make



# right now we get these from the environment, but we should

# pick them from the tree somewhere

TOOLS_PREFIX := #prebuilt/windows/host/bin/

TOOLS_EXE_SUFFIX := .exe



# Settings to use MinGW has a cross-compiler under Linux

ifneq ($(findstring Linux,$(UNAME)),)

ifdef USE_MINGW

HOST_ACP_UNAVAILABLE := true

TOOLS_EXE_SUFFIX :=

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DUSE_MINGW -DWIN32_LEAN_AND_MEAN

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -Wno-unused-parameter

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += --sysroot=prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
@@ -36,8 +27,6 @@ TOOLS_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/bin/x86_64-w 
$(combo_2nd_arch_prefix)HOST_C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include

$(combo_2nd_arch_prefix)HOST_C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include

$(combo_2nd_arch_prefix)HOST_GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32

endif # USE_MINGW

endif # Linux



# Workaround differences in inttypes.h between host and target.

# See bug 12708004.
@@ -59,22 +48,6 @@ ifneq ($(strip $(BUILD_HOST_static)),) 
$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -static

endif # BUILD_HOST_static



# when building under Cygwin, ensure that we use Mingw compilation by default.

# you can disable this (i.e. to generate Cygwin executables) by defining the

# USE_CYGWIN variable in your environment, e.g.:

#

#   export USE_CYGWIN=1

#

# note that the -mno-cygwin flags are not needed when cross-compiling the

# Windows host tools on Linux

#

ifneq ($(findstring CYGWIN,$(UNAME)),)

ifeq ($(strip $(USE_CYGWIN)),)

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -mno-cygwin

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -mno-cygwin -mconsole

endif

endif



############################################################

## Macros after this line are shared by the 64-bit config.
@@ -82,7 +55,6 @@ HOST_SHLIB_SUFFIX := .dll 
HOST_EXECUTABLE_SUFFIX := .exe



# $(1): The file to check

# TODO: find out what format cygwin's stat(1) uses

define get-file-size

999999999

stat --format "%s" "$(1)" | tr -d '\n'

endef

core/combo/HOST_windows-x86_64.mk

+2 −26
Original line number Diff line number Diff line
@@ -14,25 +14,17 @@ 
# limitations under the License.

#



# Configuration for Windows on x86_64.

# Settings to use MinGW as a cross-compiler under Linux

# Included by combo/select.make



# right now we get these from the environment, but we should

# pick them from the tree somewhere

TOOLS_PREFIX := #prebuilt/windows/host/bin/

TOOLS_EXE_SUFFIX := .exe

TOOLS_PREFIX := /usr/bin/amd64-mingw32msvc-



# Settings to use MinGW has a cross-compiler under Linux

ifneq ($(findstring Linux,$(UNAME)),)

ifdef USE_MINGW

HOST_ACP_UNAVAILABLE := true

TOOLS_EXE_SUFFIX :=

HOST_GLOBAL_CFLAGS += -DUSE_MINGW

TOOLS_PREFIX := /usr/bin/amd64-mingw32msvc-

HOST_C_INCLUDES += /usr/lib/gcc/amd64-mingw32msvc/4.4.2/include

HOST_GLOBAL_LD_DIRS += -L/usr/amd64-mingw32msvc/lib

endif # USE_MINGW

endif # Linux



# Workaround differences in inttypes.h between host and target.

# See bug 12708004.
@@ -50,19 +42,3 @@ ifneq ($(strip $(BUILD_HOST_static)),) 
# Statically-linked binaries are desirable for sandboxed environment

HOST_GLOBAL_LDFLAGS += -static

endif # BUILD_HOST_static
 


# when building under Cygwin, ensure that we use Mingw compilation by default.

# you can disable this (i.e. to generate Cygwin executables) by defining the

# USE_CYGWIN variable in your environment, e.g.:

#

#   export USE_CYGWIN=1

#

# note that the -mno-cygwin flags are not needed when cross-compiling the

# Windows host tools on Linux

#

ifneq ($(findstring CYGWIN,$(UNAME)),)

ifeq ($(strip $(USE_CYGWIN)),)

HOST_GLOBAL_CFLAGS += -mno-cygwin

HOST_GLOBAL_LDFLAGS += -mno-cygwin -mconsole

endif

endif

core/combo/javac.mk

+1 −6
Original line number Diff line number Diff line
@@ -26,12 +26,7 @@ ifdef JAVAC_WRAPPER 
endif



# Whatever compiler is on this system.

ifeq ($(BUILD_OS), windows)

    COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \

        $(common_jdk_flags)

else

COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_jdk_flags)

endif



# Eclipse.

ifeq ($(CUSTOM_JAVA_COMPILER), eclipse)

core/config.mk

+0 −5
Original line number Diff line number Diff line
@@ -493,12 +493,7 @@ ANDROID_MANIFEST_MERGER := java -classpath prebuilts/devtools/tools/lib/manifest 


YACC_HEADER_SUFFIX:= .hpp



# Don't use column under Windows, cygwin or not

ifeq ($(HOST_OS),windows)

COLUMN:= cat

else

COLUMN:= column

endif



HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)

core/definitions.mk

+1 −6
Original line number Diff line number Diff line
@@ -1645,11 +1645,7 @@ $(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \ 
    $(addprefix --rename-instrumentation-target-package , $(PRIVATE_MANIFEST_INSTRUMENTATION_FOR))

endef



ifeq ($(HOST_OS),windows)

xlint_unchecked :=

else

xlint_unchecked := -Xlint:unchecked

endif



ifeq (true, $(ENABLE_INCREMENTALJAVAC))

incremental_dex := --incremental
@@ -1988,13 +1984,12 @@ endef 


#TODO: use a smaller -Xmx value for most libraries;

#      only core.jar and framework.jar need a heap this big.

# Avoid the memory arguments on Windows, dx fails to load for some reason with them.

define transform-classes.jar-to-dex

@echo "target Dex: $(PRIVATE_MODULE)"

@mkdir -p $(dir $@)

$(hide) rm -f $(dir $@)classes*.dex

$(hide) $(DX) \

    $(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx2048M) \

    -JXms16M -JXmx2048M \

    --dex --output=$(dir $@) \

    $(incremental_dex) \

    $(if $(NO_OPTIMIZE_DX), \