* commit '48d95e752536dc7a81c141e435e8a90b7929cf02': Remove legacy windows platform build support
This commit is contained in:
Dan Willemsen
Android Git Automerger
commit
1b14846717
10 changed files with 8 additions and 145 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
# 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_ACP_UNAVAILABLE := true
|
||||
HOST_GLOBAL_CFLAGS += -DUSE_MINGW
|
||||
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
|
||||
|
|
|
|||
|
|
@ -31,12 +31,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
|
||||
COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_jdk_flags)
|
||||
|
||||
# Eclipse.
|
||||
ifeq ($(CUSTOM_JAVA_COMPILER), eclipse)
|
||||
|
|
|
|||
|
|
@ -519,12 +519,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)
|
||||
|
||||
|
|
|
|||
|
|
@ -1646,11 +1646,7 @@ $(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \
|
|||
--skip-symbols-without-default-localization
|
||||
endef
|
||||
|
||||
ifeq ($(HOST_OS),windows)
|
||||
xlint_unchecked :=
|
||||
else
|
||||
xlint_unchecked := -Xlint:unchecked
|
||||
endif
|
||||
|
||||
# emit-line, <word list>, <output file>
|
||||
define emit-line
|
||||
|
|
@ -1920,13 +1916,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 $@) \
|
||||
$(if $(NO_OPTIMIZE_DX), \
|
||||
--no-optimize) \
|
||||
|
|
|
|||
|
|
@ -53,9 +53,6 @@ endif
|
|||
ifneq (,$(findstring Macintosh,$(UNAME)))
|
||||
HOST_OS := darwin
|
||||
endif
|
||||
ifneq (,$(findstring CYGWIN,$(UNAME)))
|
||||
HOST_OS := windows
|
||||
endif
|
||||
|
||||
# BUILD_OS is the real host doing the build.
|
||||
BUILD_OS := $(HOST_OS)
|
||||
|
|
|
|||
10
core/main.mk
10
core/main.mk
|
|
@ -38,8 +38,6 @@ endif
|
|||
#endif
|
||||
|
||||
# Check for broken versions of make.
|
||||
# (Allow any version under Cygwin since we don't actually build the platform there.)
|
||||
ifeq (,$(findstring CYGWIN,$(shell uname -sm)))
|
||||
ifneq (1,$(strip $(shell expr $(MAKE_VERSION) \>= 3.81)))
|
||||
$(warning ********************************************************************************)
|
||||
$(warning * You are using version $(MAKE_VERSION) of make.)
|
||||
|
|
@ -48,7 +46,6 @@ $(warning * see https://source.android.com/source/download.html)
|
|||
$(warning ********************************************************************************)
|
||||
$(error stopping)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Absolute path of the present working direcotry.
|
||||
# This overrides the shell variable $PWD, which does not necessarily points to
|
||||
|
|
@ -131,7 +128,6 @@ ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
|
|||
|
||||
$(info Checking build tools versions...)
|
||||
|
||||
ifneq ($(HOST_OS),windows)
|
||||
# check for a case sensitive file system
|
||||
ifneq (a,$(shell mkdir -p $(OUT_DIR) ; \
|
||||
echo a > $(OUT_DIR)/casecheck.txt; \
|
||||
|
|
@ -143,7 +139,6 @@ $(warning Please move your source tree to a case-sensitive filesystem.)
|
|||
$(warning ************************************************************)
|
||||
$(error Case-insensitive filesystems not supported)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Make sure that there are no spaces in the absolute path; the
|
||||
# build system can't deal with them.
|
||||
|
|
@ -463,11 +458,6 @@ ifeq ($(SDK_ONLY),true)
|
|||
include $(TOPDIR)sdk/build/windows_sdk_whitelist.mk
|
||||
include $(TOPDIR)development/build/windows_sdk_whitelist.mk
|
||||
|
||||
# Exclude tools/acp when cross-compiling windows under linux
|
||||
ifeq ($(findstring Linux,$(UNAME)),)
|
||||
subdirs += build/tools/acp
|
||||
endif
|
||||
|
||||
else # !SDK_ONLY
|
||||
#
|
||||
# Typical build; include any Android.mk files we can find.
|
||||
|
|
|
|||
|
|
@ -5,9 +5,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|||
LOCAL_SRC_FILES:= \
|
||||
CopyFile.c
|
||||
|
||||
ifeq ($(HOST_OS),cygwin)
|
||||
LOCAL_CFLAGS += -DWIN32_EXE
|
||||
endif
|
||||
ifeq ($(HOST_OS),darwin)
|
||||
LOCAL_CFLAGS += -DMACOSX_RSRC
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -543,57 +543,6 @@ static int copyFileRecursive(const char* src, const char* dst, bool isCmdLine, u
|
|||
statResult = stat(src, &srcStat);
|
||||
statErrno = errno; /* preserve across .exe attempt */
|
||||
|
||||
#ifdef WIN32_EXE
|
||||
/*
|
||||
* Here's the interesting part. Under Cygwin, if you have a file
|
||||
* called "foo.exe", stat("foo", ...) will succeed, but open("foo", ...)
|
||||
* will fail. We need to figure out what its name is supposed to be
|
||||
* so we can create the correct destination file.
|
||||
*
|
||||
* If we don't have the "-e" flag set, we want "acp foo bar" to fail,
|
||||
* not automatically find "foo.exe". That way, if we really were
|
||||
* trying to copy "foo", it doesn't grab something we don't want.
|
||||
*/
|
||||
if (isCmdLine && statResult == 0) {
|
||||
int tmpFd;
|
||||
tmpFd = open(src, O_RDONLY | O_BINARY, 0);
|
||||
if (tmpFd < 0) {
|
||||
statResult = -1;
|
||||
statErrno = ENOENT;
|
||||
} else {
|
||||
(void) close(tmpFd);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* If we didn't find the file, try it again with ".exe".
|
||||
*/
|
||||
if (isCmdLine && statResult < 0 && statErrno == ENOENT && (options & COPY_TRY_EXE)) {
|
||||
srcExe = malloc(strlen(src) + 4 +1);
|
||||
strcpy(srcExe, src);
|
||||
strcat(srcExe, ".exe");
|
||||
|
||||
if (options & COPY_NO_DEREFERENCE)
|
||||
statResult = lstat(srcExe, &srcStat);
|
||||
else
|
||||
statResult = stat(srcExe, &srcStat);
|
||||
|
||||
if (statResult == 0 && !S_ISREG(srcStat.st_mode))
|
||||
statResult = -1; /* fail, use original statErrno below */
|
||||
|
||||
if (statResult == 0) {
|
||||
/* found a .exe, copy that instead */
|
||||
dstExe = malloc(strlen(dst) + 4 +1);
|
||||
strcpy(dstExe, dst);
|
||||
strcat(dstExe, ".exe");
|
||||
|
||||
src = srcExe;
|
||||
dst = dstExe;
|
||||
} else {
|
||||
DBUG(("--- couldn't find '%s' either\n", srcExe));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (statResult < 0) {
|
||||
if (statErrno == ENOENT)
|
||||
fprintf(stderr, "acp: file '%s' does not exist\n", src);
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|||
LOCAL_SRC_FILES := \
|
||||
acp.c
|
||||
|
||||
ifeq ($(HOST_OS),cygwin)
|
||||
LOCAL_CFLAGS += -DWIN32_EXE
|
||||
endif
|
||||
ifeq ($(HOST_OS),darwin)
|
||||
LOCAL_CFLAGS += -DMACOSX_RSRC
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue