Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
This makes runtest, in particular, happier, since it will now find that its idea of the cwd actually matches with what's claimed in ANDROID_BUILD_TOP. Change-Id: I485df382d9d314a73b410030bf2116215b6250f9
This commit is contained in:
parent
636458dd06
commit
d0b274d962
@ -537,7 +537,10 @@ function gettop
|
|||||||
echo $TOP
|
echo $TOP
|
||||||
else
|
else
|
||||||
if [ -f $TOPFILE ] ; then
|
if [ -f $TOPFILE ] ; then
|
||||||
echo $PWD
|
# The following circumlocution (repeated below as well) ensures
|
||||||
|
# that we record the true directory name and not one that is
|
||||||
|
# faked up with symlink names.
|
||||||
|
PWD= /bin/pwd
|
||||||
else
|
else
|
||||||
# We redirect cd to /dev/null in case it's aliased to
|
# We redirect cd to /dev/null in case it's aliased to
|
||||||
# a command that prints something as a side-effect
|
# a command that prints something as a side-effect
|
||||||
@ -546,7 +549,7 @@ function gettop
|
|||||||
T=
|
T=
|
||||||
while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do
|
while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do
|
||||||
cd .. > /dev/null
|
cd .. > /dev/null
|
||||||
T=$PWD
|
T=`PWD= /bin/pwd`
|
||||||
done
|
done
|
||||||
cd $HERE > /dev/null
|
cd $HERE > /dev/null
|
||||||
if [ -f "$T/$TOPFILE" ]; then
|
if [ -f "$T/$TOPFILE" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user