commit fa50d406bb37c045484641d093be152ac639e936
author Colin Cross <ccross@android.com> Thu Apr 22 13:05:41 2021 -0700
committer Colin Cross <ccross@android.com> Thu Apr 22 13:05:41 2021 -0700
tree 263fde488816007ae9469f9c0176784b0bd2567d
parent 37b11b8cfb69966302fd52d9d343b702cfb43e5f

Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu

An old TARGET_PRODUCT value pointing to a removed product or an invalid
TARGET_BUILD_VARIANT value cause lunch to fail to read
COMMON_LUNCH_CHOICES, clear them before calling into the build with
get_build_var.

Test: TARGET_PRODUCT=foobar TARGET_BUILD_VARIANT=foobar lunch
Change-Id: I53d205784149ba7e32cc093f9d81d1a82c08bfc0

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index a2f7227..b5c729d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -608,7 +608,7 @@
 {
     local uname=$(uname)
     local choices
-    choices=$(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES 2>/dev/null)
+    choices=$(TARGET_BUILD_APPS= TARGET_PRODUCT= TARGET_BUILD_VARIANT= get_build_var COMMON_LUNCH_CHOICES 2>/dev/null)
     local ret=$?
 
     echo