commit fc82be6e776acfc3d784e61e2026d65417285495
author Ian Rogers <irogers@google.com> Fri Oct 17 03:56:42 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 17 03:56:42 2014 +0000
tree 3e99f1ab8b7d8f65a3275da3eac70e9c6f1a9e61
parent 4e3e9ffbf314500d303724aefbddf1b89094cfd8
parent 6825e3c9db837814f10cf6642df9e937b3990cfc

Merge "Add LPAE to dex2oat ISA feature list."

core/find-jdk-tools-jar.sh

diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index f150a9a..0224829 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -2,7 +2,13 @@
 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=$(realpath $(which javac) 2>/dev/null)
+    if [ -z "$JAVAC" ]; then
+        JAVAC=$(readlink -f $(which javac) 2>/dev/null)
+    fi
+    if [ -z "$JAVAC" ]; then
+        JAVAC=$(which javac)
+    fi
     if [ -z "$JAVAC" ] ; then
         exit 1
     fi