commit 0fe27f448b075b3908c73d1c747077aec114d790
author Greg Kaiser <gkaiser@google.com> Wed Oct 25 21:28:13 2023 +0000
committer Greg Kaiser <gkaiser@google.com> Wed Oct 25 21:28:57 2023 +0000
tree b4132260b07944e2e355d716eb9b9083362e0e50
parent 6787354f96ca0f73f3a0c7da7fe07f3be7d88ba0

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

target/product/AndroidProducts.mk

diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index c3bc14b..18b36aa 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -84,7 +84,7 @@
     $(LOCAL_DIR)/module_x86_64only.mk \
 
 COMMON_LUNCH_CHOICES := \
-    aosp_arm64-eng \
-    aosp_arm-eng \
-    aosp_x86_64-eng \
-    aosp_x86-eng \
+    aosp_arm64-trunk_staging-eng \
+    aosp_arm-trunk_staging-eng \
+    aosp_x86_64-trunk_staging-eng \
+    aosp_x86-trunk_staging-eng \