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

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

am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions" 

* commit '4e3e9ffb':
  Fix Java detection on some Linux distributions
parents defe864a 4e3e9ffb

core/find-jdk-tools-jar.sh

+7 −1
Original line number Diff line number Diff line
@@ -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=$(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