Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d29fc2d authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 7beaea15: am 15d00664: Merge "Revert "Fix Java detection on some Linux distributions""

* commit '7beaea15':
  Revert "Fix Java detection on some Linux distributions"
parents 24e4157e 7beaea15
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -2,9 +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=$(readlink -f $(which javac))
    JAVAC=$(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