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

Commit c9e50e33 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "Improve bazel() warning in envsetup.sh." am: c137b852 am: e0b4775f 

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

Change-Id: I9fbbe19b672c4bd0f514040fc6d49b82aefaf784
parents fb85d6b2 e0b4775f

envsetup.sh

+6 −6
Original line number Diff line number Diff line
@@ -331,17 +331,17 @@ function setpaths() 


function bazel()

{

    if which bazel &>/dev/null; then

        >&2 echo "NOTE: bazel() function sourced from Android's envsetup.sh is being used instead of $(which bazel)"

        >&2 echo

    fi



    local T="$(gettop)"

    if [ ! "$T" ]; then

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

        >&2 echo "Couldn't locate the top of the Android tree. Try setting TOP. This bazel() function cannot be used outside of the AOSP directory."

        return

    fi



    if which bazel &>/dev/null; then

        >&2 echo "NOTE: bazel() function sourced from envsetup.sh is being used instead of $(which bazel)"

        >&2 echo

    fi



    "$T/tools/bazel" "$@"

}