commit ef5751c1ecb41d0a807484155a210631e45abd27
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 02 18:13:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 02 18:13:34 2016 +0000
tree 6939b19d6954a8b2a04c28317c62dd78ba1c3fe3
parent 5ccafd0f29e0d0d77a63d4b1a3bfb8fb26cd245f
parent 433905f50e8ec9c7f67e89ca4e56bcb2b0ca7b5e

Merge "build_image: add padding to match partition size"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index ea2446c..e919891 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -886,8 +886,10 @@
       echo "Couldn't locate the top of the tree.  Try setting TOP."
       return 1
     fi
-    local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'`
-    local MODULES_IN_PATHS=MODULES-IN-$MY_PWD
+    local M=$(findmakefile)
+    # Remove the path to top as the makefilepath needs to be relative
+    local M=`echo $M|sed 's:'$T'/::'`
+    local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M})
     # Convert "/" to "-".
     MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-}
     $DRV make -C $T -f build/core/main.mk $@ $MODULES_IN_PATHS