From d9a3d4d7dd4c949bdd0c5952ebe231c9012b3b26 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Wed, 20 Dec 2023 22:05:00 +0000
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
Bug: 317213158
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:748a543cf5b95a759cb9525388ad310c1108bd8a)
Merged-In: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
Change-Id: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
---
 AndroidProducts.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4e79d41..b343f20 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -28,6 +28,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_shiba.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_ripcurrent-userdebug \
-    aosp_husky-userdebug \
-    aosp_shiba-userdebug
+    aosp_ripcurrent-trunk_staging-userdebug \
+    aosp_husky-trunk_staging-userdebug \
+    aosp_shiba-trunk_staging-userdebug