diff options
| author | Ying Wang <wangying@google.com> | 2010-07-07 18:12:25 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@android.com> | 2010-09-22 11:02:09 -0700 |
| commit | b368bba41c4fb9b5c76a56cb1bd850517ef9df53 (patch) | |
| tree | 1294f0d30708dccee15a69e3116e1eef093a6bb7 | |
| parent | 1e80c294ffef26a6a7fe435411cd7557003b1d3f (diff) | |
| download | build-tools_r7.tar.gz | |
Enforce 64-bit build environmentandroid-adt-0.9.9tools_r7
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
| -rwxr-xr-x | core/find-jdk-tools-jar.sh | 2 | ||||
| -rw-r--r-- | core/main.mk | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh index 4c40627ebb..f55557629c 100755 --- a/core/find-jdk-tools-jar.sh +++ b/core/find-jdk-tools-jar.sh @@ -3,7 +3,7 @@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ; else JAVAC=$(which javac) 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 fi while [ -L $JAVAC ] ; do diff --git a/core/main.mk b/core/main.mk index b51b3c4431..f761ba56bc 100644 --- a/core/main.mk +++ b/core/main.mk @@ -60,12 +60,23 @@ include $(BUILD_SYSTEM)/config.mk # be generated correctly include $(BUILD_SYSTEM)/cleanbuild.mk -VERSION_CHECK_SEQUENCE_NUMBER := 1 +VERSION_CHECK_SEQUENCE_NUMBER := 2 -include $(OUT_DIR)/versions_checked.mk ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED)) $(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)-$(HOST_ARCH),darwin-ppc) # check for a case sensitive file system |