commit c7f1389d2683be9068d22666b484e48abcff12f1
author Ying Wang <wangying@android.com> Mon Jul 14 21:36:53 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 14 17:15:23 2014 +0000
tree be06d5797e2f929774305c54eade6e1b45ce9756
parent 60a0ba2b345720313d1beb0421db57ece75c063c
parent 09040dd8232f8fe588d938e04581ba1648f452f4

Merge "Fix Java detection on some Linux distributions"

core/find-jdk-tools-jar.sh

diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index f150a9a..d1b3ce9 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -2,13 +2,9 @@
 if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ; then
     echo $ANDROID_JAVA_HOME/lib/tools.jar
 else
-    JAVAC=$(which javac)
+    JAVAC=$(readlink -f $(which javac))
     if [ -z "$JAVAC" ] ; then
         exit 1
     fi
-    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