From b1e605a61591d0108aef0603c4276c3b79f3154a Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Wed, 25 Oct 2023 16:44:34 -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
---
 AndroidProducts.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index e7a87c1..4328459 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -10,6 +10,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_rpi4_tv.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_rpi4-userdebug \
-    aosp_rpi4_car-userdebug \
-    aosp_rpi4_tv-userdebug
+    aosp_rpi4-trunk_staging-userdebug \
+    aosp_rpi4_car-trunk_staging-userdebug \
+    aosp_rpi4_tv-trunk_staging-userdebug