diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-31 14:03:21 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-05-31 14:03:21 -0700 |
| commit | 8cbdef7eba1ef83d009326aaba750e78f68b061f (patch) | |
| tree | 0d76d9d26239579812b8918735f08df92bab2dd8 | |
| parent | bd0c91c8b9d36fd3ed8d8ac7e66b3e1eee3bb0bb (diff) | |
| parent | 053dccb159e2f73aa763bfdc4578586fba57f841 (diff) | |
| download | build-8cbdef7eba1ef83d009326aaba750e78f68b061f.tar.gz | |
Merge "Relax the constraint of 64bit build environment." into gingerbreadandroid-cts-2.3_r4
| -rw-r--r-- | core/config.mk | 6 | ||||
| -rw-r--r-- | core/main.mk | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/core/config.mk b/core/config.mk index a3bcbf1ea6..f8bee808a8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -267,6 +267,12 @@ else HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) endif +# Is the host JDK 64-bit version? +HOST_JDK_IS_64BIT_VERSION := +ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),) +HOST_JDK_IS_64BIT_VERSION := true +endif + # It's called md5 on Mac OS and md5sum on Linux ifeq ($(HOST_OS),darwin) MD5SUM:=md5 -q diff --git a/core/main.mk b/core/main.mk index b288080253..3da0648754 100644 --- a/core/main.mk +++ b/core/main.mk @@ -70,17 +70,6 @@ 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 |