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:b0fb9be930027aa1664c9410697af4a4ec8ab5c3)
Merged-In: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8
This commit is contained in:
Greg Kaiser 2023-10-30 22:00:49 +00:00 committed by Android Build Cherrypicker Worker
parent 3b1c277470
commit 5e34e006c3

View file

@ -27,9 +27,9 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/factory_panther.mk $(LOCAL_DIR)/factory_panther.mk
COMMON_LUNCH_CHOICES := \ COMMON_LUNCH_CHOICES := \
aosp_cloudripper-userdebug \ aosp_cloudripper-trunk_staging-userdebug \
aosp_ravenclaw-userdebug \ aosp_ravenclaw-trunk_staging-userdebug \
aosp_cheetah-userdebug \ aosp_cheetah-trunk_staging-userdebug \
aosp_cheetah_hwasan-userdebug \ aosp_cheetah_hwasan-trunk_staging-userdebug \
aosp_panther-userdebug \ aosp_panther-trunk_staging-userdebug \
aosp_panther_hwasan-userdebug aosp_panther_hwasan-trunk_staging-userdebug