Merge "Improve bazel() warning in envsetup.sh."

This commit is contained in:
Jingwen Chen
2021-06-10 10:29:35 +00:00
committed by Gerrit Code Review

View File

@@ -331,15 +331,15 @@ function setpaths()
function bazel() function bazel()
{ {
local T="$(gettop)" if which bazel &>/dev/null; then
if [ ! "$T" ]; then >&2 echo "NOTE: bazel() function sourced from Android's envsetup.sh is being used instead of $(which bazel)"
echo "Couldn't locate the top of the tree. Try setting TOP." >&2 echo
return
fi fi
if which bazel &>/dev/null; then local T="$(gettop)"
>&2 echo "NOTE: bazel() function sourced from envsetup.sh is being used instead of $(which bazel)" if [ ! "$T" ]; then
>&2 echo >&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 fi
"$T/tools/bazel" "$@" "$T/tools/bazel" "$@"