From d38649a465a97699cb1672af918218900a094871 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Wed, 25 Oct 2023 16:19:51 -0600
Subject: [PATCH] Fix lunch choices for git_main

We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I7fdc6f7d709ea0adf2d9064798734703a02c8d22
---
 AndroidProducts.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 26b49d88..0390c151 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -31,8 +31,8 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_tokay_fullmte.mk \
     $(LOCAL_DIR)/factory_tokay.mk
 COMMON_LUNCH_CHOICES := \
-    aosp_caiman-userdebug \
-    aosp_komodo-userdebug \
-    aosp_ripcurrentpro-userdebug \
-    aosp_ripcurrent24-userdebug \
-    aosp_tokay-userdebug
+    aosp_caiman-trunk_staging-userdebug \
+    aosp_komodo-trunk_staging-userdebug \
+    aosp_ripcurrentpro-trunk_staging-userdebug \
+    aosp_ripcurrent24-trunk_staging-userdebug \
+    aosp_tokay-trunk_staging-userdebug