openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Continue using the real make if -C is used 

To allow building other make-based systems from the top of the android
tree.

Bug: 64145979
Test: get_make_command
Test: get_make_command -C
Test: get_make_command -C.
Test: get_make_command -C .
Test: get_make_command -j test
Test: get_make_command test-C
Test: get_make_command " -C"
Test: make
Test: make -C.
Change-Id: I406dd2706f19e5d2a6afdff441335f4e01ba6d12
This commit is contained in:
Dan Willemsen 2017-07-28 13:00:13 -07:00
parent 28989a9a22
commit e984224899
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

@ -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()