StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "mma in dirs w/o Android.(mk|bp) in ancestor dir"

Browse Source
This commit is contained in:
Treehugger Robot
2018-06-14 00:58:52 +00:00
committed by Gerrit Code Review
parent 2371a7d60e 3b99ecfbab
commit ea01e649d7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
envsetup.sh
View File

@@ -742,6 +742,7 @@ function findmakefile()
\cd .. \cd ..
done done
\cd $HERE \cd $HERE
return 1
} }
function mm() function mm()
@@ -869,7 +870,7 @@ function mma()
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
return 1 return 1
fi fi
local M=$(findmakefile) local M=$(findmakefile || echo $(realpath $PWD)/Android.mk)
# Remove the path to top as the makefilepath needs to be relative # Remove the path to top as the makefilepath needs to be relative
local M=`echo $M|sed 's:'$T'/::'` local M=`echo $M|sed 's:'$T'/::'`
local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M}) local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M})