diff options
| author | Ying Wang <wangying@android.com> | 2014-07-15 01:22:50 +0000 |
|---|---|---|
| committer | Ying Wang <wangying@android.com> | 2014-07-15 01:22:50 +0000 |
| commit | d28feb006605a791c01afe82544a756f90c5f9e9 (patch) | |
| tree | 5debeedfb764c953a3997f045d6a2eaffa6b7a5d | |
| parent | 09040dd8232f8fe588d938e04581ba1648f452f4 (diff) | |
| download | build-d28feb006605a791c01afe82544a756f90c5f9e9.tar.gz build-d28feb006605a791c01afe82544a756f90c5f9e9.tar.bz2 build-d28feb006605a791c01afe82544a756f90c5f9e9.zip | |
Revert "Fix Java detection on some Linux distributions"
This reverts commit 09040dd8232f8fe588d938e04581ba1648f452f4.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
| -rwxr-xr-x | core/find-jdk-tools-jar.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh index d1b3ce969..f150a9abd 100755 --- a/core/find-jdk-tools-jar.sh +++ b/core/find-jdk-tools-jar.sh @@ -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 |