diff --git a/envsetup.sh b/envsetup.sh
index bb346de4a..a76deb9fd 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -625,7 +625,8 @@ function mmm()
             if [ -f $DIR/Android.mk ]; then
                 TO_CHOP=`echo $T | wc -c | tr -d ' '`
                 TO_CHOP=`expr $TO_CHOP + 1`
-                MFILE=`echo $PWD | cut -c${TO_CHOP}-`
+                START=`PWD= /bin/pwd`
+                MFILE=`echo $START | cut -c${TO_CHOP}-`
                 if [ "$MFILE" = "" ] ; then
                     MFILE=$DIR/Android.mk
                 else