resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
diff --git a/core/config.mk b/core/config.mk
index e8eef81..3a068d8 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -269,8 +269,8 @@
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 JDK-5.0, \
- update 12 or higher, which you can download from java.sun.com)
+$(error Error: could not find jdk tools.jar, please install JDK-6.0, \
+ which you can download from java.sun.com)
endif
endif
diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index f21c48b..ed0b127 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -3,7 +3,7 @@
else
JAVAC=$(which javac)
if [ -z "$JAVAC" ] ; then
- exit 1
+ exit 1
fi
while [ -L $JAVAC ] ; do
LSLINE=$(ls -l $JAVAC)
diff --git a/core/main.mk b/core/main.mk
index ce74dbd..6e33a9a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -75,7 +75,7 @@
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 now.)
+$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
$(warning ************************************************************)
$(error stop)
endif