p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 554402f7 to master 

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
This commit is contained in:
Ying Wang 2010-09-22 14:11:49 -07:00
parent fed45d859a 554402f76d
commit 1613f4ff1e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@ -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

2
core/find-jdk-tools-jar.sh
View File

@ -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)

2
core/main.mk
View File

@ -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