Merge c1efb060

Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d

diff --cc core/config.mk
index c6f6288,2f3b3ee..e49800d
--- 1/core/config.mk
--- 2/core/config.mk
+++ b/core/config.mk
@@@ -271,12 -268,14 +271,18 @@@ ifeq ($(HOST_OS),darwin
  HOST_JDK_TOOLS_JAR :=
  else
  HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
 +ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
 +$(error Error: could not find jdk tools.jar, please install JDK6, \
 +    which you can download from java.sun.com)
 +endif
  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 --cc core/main.mk
Simple merge