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

Commit 39b8418e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make verifymodinfo in envsetup.sh quiet on errors during tab completion" am: bf7d6d78 

Original change: https://android-review.googlesource.com/c/platform/build/+/1675967

Change-Id: Ida65e3d231645d9f695b46af4806a1a0d3f4f1af
parents dbc7c7cf bf7d6d78

envsetup.sh

+8 −4
Original line number Diff line number Diff line
@@ -1458,13 +1458,17 @@ function refreshmod() { 
# Verifies that module-info.txt exists, creating it if it doesn't.

function verifymodinfo() {

    if [ ! "$ANDROID_PRODUCT_OUT" ]; then

        if [ "$QUIET_VERIFYMODINFO" != "true" ] ; then

            echo "No ANDROID_PRODUCT_OUT. Try running 'lunch' first." >&2

        fi

        return 1

    fi



    if [ ! -f "$ANDROID_PRODUCT_OUT/module-info.json" ]; then

        if [ "$QUIET_VERIFYMODINFO" != "true" ] ; then

            echo "Could not find module-info.json. It will only be built once, and it can be updated with 'refreshmod'" >&2

        refreshmod || return 1

        fi

        return 1

    fi

}
@@ -1602,7 +1606,7 @@ function installmod() { 


function _complete_android_module_names() {

    local word=${COMP_WORDS[COMP_CWORD]}

    COMPREPLY=( $(allmod | grep -E "^$word") )

    COMPREPLY=( $(QUIET_VERIFYMODINFO=true allmod | grep -E "^$word") )

}



# Print colored exit condition