diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-28 18:21:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 18:21:48 -0700 |
| commit | c43ac33bcc69a7cc2a9d4ef64598216851e308e1 (patch) | |
| tree | a55fa8ff33d8c68edb657adc63048a2c4e757e8f /envsetup.sh | |
| parent | b5425fdfc8e37c6381152ae68566715b917b81eb (diff) | |
| parent | 73143d9dfcaca5416d46be2733bb370824b3acb2 (diff) | |
| download | build-c43ac33bcc69a7cc2a9d4ef64598216851e308e1.zip build-c43ac33bcc69a7cc2a9d4ef64598216851e308e1.tar.gz build-c43ac33bcc69a7cc2a9d4ef64598216851e308e1.tar.bz2 | |
am 73143d9d: am ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '73143d9dfcaca5416d46be2733bb370824b3acb2'
* commit '73143d9dfcaca5416d46be2733bb370824b3acb2':
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index 283826e..1f35061 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -678,7 +678,7 @@ function mmm() 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}-` |