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 /core/find-jdk-tools-jar.sh | |
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
Diffstat (limited to 'core/find-jdk-tools-jar.sh')
-rwxr-xr-x | core/find-jdk-tools-jar.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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) |