OSDN Git Service

am 8755e2b2: am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
authorRaphael Moll <ralf@android.com>
Sat, 12 Mar 2011 00:05:53 +0000 (16:05 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Mar 2011 00:05:53 +0000 (16:05 -0800)
* commit '8755e2b2c21dd54063fcb62c26c4a2d3575610cf':
  Fix find-jdk-tools-jar to be cygwin-friendly.

1  2 
core/find-jdk-tools-jar.sh

@@@ -3,11 -3,12 +3,11 @@@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ 
  else
      JAVAC=$(which javac)
      if [ -z "$JAVAC" ] ; then
 -      echo "Please-install-JDK-6,-which-you-can-download-from-java.sun.com"
 -      exit 1
 +        exit 1
      fi
-     while [ -L $JAVAC ] ; do
-         LSLINE=$(ls -l $JAVAC)
-         JAVAC=$(echo -n $LSLINE | sed -e "s/.* -> //")
+     while [ -L "$JAVAC" ] ; do
+         LSLINE=$(ls -l "$JAVAC")
+         JAVAC=$(echo -n "$LSLINE" | sed -e "s/.* -> //")
      done
      echo $JAVAC | sed -e "s:\(.*\)/bin/javac.*:\\1/lib/tools.jar:"
  fi