Fix Java detection on some Linux distributions
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm pretty sure some others do the same thing), "which javac" returns /usr/bin/javac, which is a symlink to "../../etc/alternatives/javac", which in turn points at whatever the JDK the user picked as his default. Given "../../etc/alternatives/javac" is a relative, symlink, the next iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java relative to the build directory), causing tools.jar not to be found. Using readlink -f should work in all cases (while also simplifying the script a bit). Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
This commit is contained in:
parent
6ff849568c
commit
09040dd823
|
@ -2,13 +2,9 @@
|
|||
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=$(readlink -f $(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