Move cog setup logic into shell_utils so it can be used when any of these commands are run:

- `m`
- `lunch`
- `source build/envsetup.sh`

this will set up the symlink properly regardless of the order of commands so users don't get stuck with a broken build

Bug: 362337892
Change-Id: Ibd3b262107dfc1024cd83ab8aeb33a299fb0ffb2

1 files changed, 2 insertions, 4 deletions

diff --git a/envsetup.sh b/envsetup.sh
index 06dadd3f38..3fed5aed6d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -442,6 +442,7 @@ function print_lunch_menu()
 function lunch()
 {
     local answer
+    setup_cog_env_if_needed
 
     if [[ $# -gt 1 ]]; then
         echo "usage: lunch [target]" >&2
@@ -1079,10 +1080,7 @@ function source_vendorsetup() {
         done
     done
 
-    if [[ "${PWD}" == /google/cog/* ]]; then
-        f="build/make/cogsetup.sh"
-        echo "including $f"; . "$T/$f"
-    fi
+    setup_cog_env_if_needed
 }
 
 function showcommands() {