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

Commit 4f5f316a authored by Roland Levillain's avatar Roland Levillain Committed by Gerrit Code Review
Browse files

Merge "Print a user-friendly message when `lunch` cannot use the default product."

parents d95545fc 23c46cf4

envsetup.sh

+18 −3
Original line number Original line Diff line number Diff line
@@ -119,13 +119,13 @@ function get_build_var() 
    if [ "$BUILD_VAR_CACHE_READY" = "true" ]

    if [ "$BUILD_VAR_CACHE_READY" = "true" ]

    then

    then

        eval "echo \"\${var_cache_$1}\""

        eval "echo \"\${var_cache_$1}\""

    return

        return 0

    fi

    fi





    local T=$(gettop)

    local T=$(gettop)

    if [ ! "$T" ]; then

    if [ ! "$T" ]; then

        echo "Couldn't locate the top of the tree.  Try setting TOP." >&2

        echo "Couldn't locate the top of the tree.  Try setting TOP." >&2

        return

        return 1

    fi

    fi

    (\cd $T; build/soong/soong_ui.bash --dumpvar-mode $1)

    (\cd $T; build/soong/soong_ui.bash --dumpvar-mode $1)

}

}
@@ -576,10 +576,25 @@ function add_lunch_combo() 
function print_lunch_menu()

function print_lunch_menu()

{

{

    local uname=$(uname)

    local uname=$(uname)

    local choices=$(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES)

    local choices

    choices=$(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES 2>/dev/null)

    local ret=$?



    echo

    echo

    echo "You're building on" $uname

    echo "You're building on" $uname

    echo

    echo



    if [ $ret -ne 0 ]

    then

        echo "Warning: Cannot display lunch menu."

        echo

        echo "Note: You can invoke lunch with an explicit target:"

        echo

        echo "  usage: lunch [target]" >&2

        echo

        return

    fi



    echo "Lunch menu... pick a combo:"

    echo "Lunch menu... pick a combo:"





    local i=1

    local i=1