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

* commit '15d00664884b9b8ce4766ab3a7fd15b83cbeaad9':
  Revert "Fix Java detection on some Linux distributions"
This commit is contained in:
Ying Wang 2014-07-15 01:27:42 +00:00 committed by Android Git Automerger
commit 7beaea15f0
1 changed files with 5 additions and 1 deletions

View File

@ -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