diff options
| author | Ying Wang <wangying@google.com> | 2010-09-22 14:11:49 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-22 14:11:49 -0700 |
| commit | 1613f4ff1ee432a01fcce70a9020f19929e7290a (patch) | |
| tree | c55bc9fa1f4e48a013113de13cbc69e118c47e02 | |
| parent | fed45d859aaecd8b34fb65eeaad678e1a1c71aa9 (diff) | |
| parent | 554402f76d8720dc3784b133d95f4aba2da4aa91 (diff) | |
| download | build-1613f4ff1ee432a01fcce70a9020f19929e7290a.zip build-1613f4ff1ee432a01fcce70a9020f19929e7290a.tar.gz build-1613f4ff1ee432a01fcce70a9020f19929e7290a.tar.bz2 | |
resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
| -rw-r--r-- | core/config.mk | 4 | ||||
| -rwxr-xr-x | core/find-jdk-tools-jar.sh | 2 | ||||
| -rw-r--r-- | core/main.mk | 2 |
3 files changed, 4 insertions, 4 deletions
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 @@ 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 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 @@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ; 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 @@ 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 now.) +$(warning Only 64-bit build environments are supported beyond froyo/2.2.) $(warning ************************************************************) $(error stop) endif |