Revert "Fix Java detection on some Linux distributions"
This reverts commit 09040dd823
.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
This commit is contained in:
parent
09040dd823
commit
d28feb0066
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue