OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
09040dd
)
Revert "Fix Java detection on some Linux distributions"
author
Ying Wang
<wangying@android.com>
Tue, 15 Jul 2014 01:22:50 +0000
(
01:22
+0000)
committer
Ying Wang
<wangying@android.com>
Tue, 15 Jul 2014 01:22:50 +0000
(
01:22
+0000)
This reverts commit
09040dd8232f8fe588d938e04581ba1648f452f4
.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
core/find-jdk-tools-jar.sh
patch
|
blob
|
history
diff --git
a/core/find-jdk-tools-jar.sh
b/core/find-jdk-tools-jar.sh
index
d1b3ce9
..
f150a9a
100755
(executable)
--- 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