commit e36683f026781d75008cbf9794f6a614c254f6d1
author Greg Kaiser <gkaiser@google.com> Wed Oct 25 16:11:57 2023 -0600
committer Greg Kaiser <gkaiser@google.com> Wed Oct 25 16:11:57 2023 -0600
tree 48dd055a3aae6ef8da806cfd5c3d18746c690886
parent dad064a84c5041a77daf6418a7a405f80ee28791

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: I1492ec879e2131fbe5c7110573fd932712251a31

AndroidProducts.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 1f24376..3e7e641 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -3,6 +3,6 @@
     $(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