Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0b274d9 authored by Dan Bornstein's avatar Dan Bornstein
Browse files

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
parent 636458dd
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -537,7 +537,10 @@ function gettop
        echo $TOP
    else
        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
            # We redirect cd to /dev/null in case it's aliased to
            # a command that prints something as a side-effect
@@ -546,7 +549,7 @@ function gettop
            T=
            while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do
                cd .. > /dev/null
                T=$PWD
                T=`PWD= /bin/pwd`
            done
            cd $HERE > /dev/null
            if [ -f "$T/$TOPFILE" ]; then