StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 38a3161d: String literal change.

Browse Source 
Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp

* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
  String literal change.
This commit is contained in:
Ying Wang
2010-09-22 13:14:49 -07:00
committed by Android Git Automerger
parent 77070aa757 38a3161dc7
commit 554402f76d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 else
JAVAC=$(which javac) JAVAC=$(which javac)
if [ -z "$JAVAC" ] ; then if [ -z "$JAVAC" ] ; then
echo "Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com" echo "Please-install-JDK-6.0,-which-you-can-download-from-java.sun.com"
exit 1 exit 1
fi fi
while [ -L $JAVAC ] ; do while [ -L $JAVAC ] ; do

2
core/main.mk
View File

@@ -75,7 +75,7 @@ build_arch := $(shell uname -m)
ifneq (64,$(findstring 64,$(build_arch))) ifneq (64,$(findstring 64,$(build_arch)))
$(warning ************************************************************) $(warning ************************************************************)
$(warning You are attempting to build on a 32-bit system.) $(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 ************************************************************) $(warning ************************************************************)
$(error stop) $(error stop)
endif endif