Merge "Fix Java detection on some Linux distributions"
This commit is contained in:
commit
4e3e9ffbf3
1 changed files with 7 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue