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

Commit 4e3e9ffb authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Fix Java detection on some Linux distributions"

parents 07b212ac 311384fe

core/find-jdk-tools-jar.sh

+7 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,13 @@ 
if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ; then

if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ; then

    echo $ANDROID_JAVA_HOME/lib/tools.jar

    echo $ANDROID_JAVA_HOME/lib/tools.jar

else

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)

        JAVAC=$(which javac)

    fi

    if [ -z "$JAVAC" ] ; then

    if [ -z "$JAVAC" ] ; then

        exit 1

        exit 1

    fi

    fi