p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

am: 218a0c0c70

Change-Id: I8239d2bbf96fd9d2d99a05592ce4770e18ac4187
This commit is contained in:
Dan Willemsen 2017-07-29 08:18:52 +00:00 committed by android-build-merger
parent 954551bb24 218a0c0c70
commit 56a2bb9ec9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
envsetup.sh
View File

@ -1544,6 +1544,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
@ -1590,7 +1597,7 @@ function _wrap_build()
function make() function make()
{ {
_wrap_build $(get_make_command) "$@" _wrap_build $(get_make_command "$@") "$@"
} }
function provision() function provision()