From 99f12f480ad67438ac64fcafa2d027055742d593 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Mon, 30 Oct 2023 22:00:57 +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
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08176b5882ebf16aed25d650aa474b3dc3d05c96)
Merged-In: I9778ab070155d18d4c67f31c9ff39863e7ba34af
Change-Id: I9778ab070155d18d4c67f31c9ff39863e7ba34af
---
 AndroidProducts.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c2c8efe..ce06e54 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -39,7 +39,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_whitefin.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_slider-userdebug \
-    aosp_whitefin-userdebug \
-    aosp_oriole-userdebug \
-    aosp_raven-userdebug
+    aosp_slider-trunk_staging-userdebug \
+    aosp_whitefin-trunk_staging-userdebug \
+    aosp_oriole-trunk_staging-userdebug \
+    aosp_raven-trunk_staging-userdebug