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

Merge "Continue using the real make if -C is used"

Browse Source
This commit is contained in:
Treehugger Robot
2017-07-29 08:11:32 +00:00
committed by Gerrit Code Review
parent dce396a70f e984224899
commit 218a0c0c70
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
envsetup.sh
View File

@@ -1542,6 +1542,13 @@ function get_make_command()
{ {
# If we're in the top of an Android tree, use soong_ui.bash instead of make # If we're in the top of an Android tree, use soong_ui.bash instead of make
if [ -f build/soong/soong_ui.bash ]; then if [ -f build/soong/soong_ui.bash ]; then
# Always use the real make if -C is passed in
for arg in "$@"; do
if [[ $arg == -C* ]]; then
echo command make
return
fi
done
echo build/soong/soong_ui.bash --make-mode echo build/soong/soong_ui.bash --make-mode
else else
echo command make echo command make
@@ -1588,7 +1595,7 @@ function _wrap_build()
function make() function make()
{ {
_wrap_build $(get_make_command) "$@" _wrap_build $(get_make_command "$@") "$@"
} }
function provision() function provision()