StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enforce 64-bit build environment

Browse Source 
We will only support 64-bit build environment beyond froyo/2.2 .

Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
This commit is contained in:
Ying Wang
2010-07-07 18:12:25 -07:00
committed by Ying Wang
parent 1e80c294ff
commit b368bba41c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/find-jdk-tools-jar.sh
View File

@@ -3,7 +3,7 @@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ;
else else
JAVAC=$(which javac) JAVAC=$(which javac)
if [ -z "$JAVAC" ] ; then if [ -z "$JAVAC" ] ; then
echo "Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com" echo "Please-install-JDK-6,-which-you-can-download-from-java.sun.com"
exit 1 exit 1
fi fi
while [ -L $JAVAC ] ; do while [ -L $JAVAC ] ; do

13
core/main.mk
View File

@@ -60,12 +60,23 @@ include $(BUILD_SYSTEM)/config.mk
# be generated correctly # be generated correctly
include $(BUILD_SYSTEM)/cleanbuild.mk include $(BUILD_SYSTEM)/cleanbuild.mk
VERSION_CHECK_SEQUENCE_NUMBER := 1 VERSION_CHECK_SEQUENCE_NUMBER := 2
-include $(OUT_DIR)/versions_checked.mk -include $(OUT_DIR)/versions_checked.mk
ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED)) ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
$(info Checking build tools versions...) $(info Checking build tools versions...)
ifeq ($(BUILD_OS),linux)
build_arch := $(shell uname -m)
ifneq (64,$(findstring 64,$(build_arch)))
$(warning ************************************************************)
$(warning You are attempting to build on a 32-bit system.)
$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
$(warning ************************************************************)
$(error stop)
endif
endif
ifneq ($(HOST_OS),windows) ifneq ($(HOST_OS),windows)
ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc) ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
# check for a case sensitive file system # check for a case sensitive file system