Merge "Walk up tree to find makefiles in mma" am: 5ccafd0f29 am: 8ff4ea8ada

am: 890ccba0c3

Change-Id: I4a0d6464908ffa0e34c603ab4c8d9233758a8f41
This commit is contained in:
Colin Cross 2016-09-01 23:48:32 +00:00 committed by android-build-merger
commit b12d56df94
1 changed files with 4 additions and 2 deletions

View File

@ -886,8 +886,10 @@ function mma()
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