commit 3939d1ca5957571814933cc311655840a513677e
author Fabián Cañas <fabiancanas@google.com> Mon Jan 08 19:06:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 08 19:06:02 2024 +0000
tree d7136d16a57f4c312540b7e02f916bafc34198db
parent 2b5412302938b0a93c64d5eacd3ff25ec0397193
parent 03dd0283bcc376095908a26b65f63bba1134b689

Merge "Fix numeric selection from lunch menu" into main

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index c0bd9e3..5aa11c7 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -788,7 +788,7 @@
         selection=aosp_cf_x86_64_phone-trunk_staging-eng
     elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$")
     then
-        local choices=($(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES))
+        local choices=($(TARGET_BUILD_APPS= TARGET_PRODUCT= TARGET_RELEASE= TARGET_BUILD_VARIANT= get_build_var COMMON_LUNCH_CHOICES 2>/dev/null))
         if [ $answer -le ${#choices[@]} ]
         then
             # array in zsh starts from 1 instead of 0.