Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8e336fb authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Continue using the real make if -C is used" am: 218a0c0c am:... 

Merge "Continue using the real make if -C is used" am: 218a0c0c am: 56a2bb9e am: 4a1a1fc2 am: f7b6dc8b
am: 1bb3269f

Change-Id: Ia378dc1c96e1944e961d2a72b269cb3f13fe5d28
parents 74a6caed 1bb3269f

envsetup.sh

+8 −1
Original line number Diff line number Diff line
@@ -1554,6 +1554,13 @@ function get_make_command() 
{

    # 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

        # 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

    else

        echo command make
@@ -1600,7 +1607,7 @@ function _wrap_build() 


function make()

{

    _wrap_build $(get_make_command) "$@"

    _wrap_build $(get_make_command "$@") "$@"

}



function provision()