From f544c411ce7c5bdd02e3e306879f7b6d7c1bf499 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Mon, 30 Oct 2023 22:11:03 +0000
Subject: 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e36683f026781d75008cbf9794f6a614c254f6d1)
Merged-In: I1492ec879e2131fbe5c7110573fd932712251a31
Change-Id: I1492ec879e2131fbe5c7110573fd932712251a31
---
 AndroidProducts.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 1f24376..3e7e641 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -3,6 +3,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/poplar.mk
 
 COMMON_LUNCH_CHOICES := \
-    poplar-eng \
-    poplar-user \
-    poplar-userdebug
+    poplar-trunk_staging-eng \
+    poplar-trunk_staging-user \
+    poplar-trunk_staging-userdebug
-- 
cgit v1.2.3