From 5e34e006c37ecebdf6fa205b3304652bd0246346 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Mon, 30 Oct 2023 22:00:49 +0000 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 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b0fb9be930027aa1664c9410697af4a4ec8ab5c3) Merged-In: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 --- AndroidProducts.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9d64a36..4467779 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -27,9 +27,9 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/factory_panther.mk COMMON_LUNCH_CHOICES := \ - aosp_cloudripper-userdebug \ - aosp_ravenclaw-userdebug \ - aosp_cheetah-userdebug \ - aosp_cheetah_hwasan-userdebug \ - aosp_panther-userdebug \ - aosp_panther_hwasan-userdebug + aosp_cloudripper-trunk_staging-userdebug \ + aosp_ravenclaw-trunk_staging-userdebug \ + aosp_cheetah-trunk_staging-userdebug \ + aosp_cheetah_hwasan-trunk_staging-userdebug \ + aosp_panther-trunk_staging-userdebug \ + aosp_panther_hwasan-trunk_staging-userdebug