commit 08176b5882ebf16aed25d650aa474b3dc3d05c96
author Greg Kaiser <gkaiser@google.com> Wed Oct 25 15:10:37 2023 -0600
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 25 23:42:17 2023 +0000
tree de06afc681c08b92a2a00dcef2bc97e85e6cade8
parent 192c82f16e652f0a5259881c1b3905ce085875ae

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

AndroidProducts.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c2c8efe..ce06e54 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -39,7 +39,7 @@
     $(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