commit ea83daa389aea493294617232b5c34414861d701
author Brian Carlstrom <bdc@google.com> Tue Sep 28 17:45:59 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 28 17:45:59 2010 -0700
tree 5ed36ea27686ec73b6065fb13f99d0294757ac26
parent 879779a5806d6e09d1c852a93dd4e1793bbd96cd
parent c634d2c19d097809a33cdd24ef888a9e0ce26df3

Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index a8f2d4d..a68f73e 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -663,7 +663,7 @@
         for DIR in $DIRS ; do
             DIR=`echo $DIR | sed -e 's:/$::'`
             if [ -f $DIR/Android.mk ]; then
-                TO_CHOP=`echo $T | wc -c | tr -d ' '`
+                TO_CHOP=`(cd -P -- $T && pwd -P) | wc -c | tr -d ' '`
                 TO_CHOP=`expr $TO_CHOP + 1`
                 START=`PWD= /bin/pwd`
                 MFILE=`echo $START | cut -c${TO_CHOP}-`