commit ddc600c179f65d724bc74673b35110cd08373810
author Ying Wang <wangying@android.com> Mon Jul 14 21:49:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 14 21:49:25 2014 +0000
tree aab5f5b278192c15edb24c9119a9718ca36cfcb0
parent 58f920d9e03e44e2b5bf6356950b8eef1cc91772
parent 1778c8746551c8f132a020f9ea4d56d13c7712d5

am 1778c874: am 3017e13f: am c7f1389d: Merge "Fix Java detection on some Linux distributions"

* commit '1778c8746551c8f132a020f9ea4d56d13c7712d5':
  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