From 6b5c8c3fffba7bc94718c1e19122fcba460bc1bb Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Mon, 30 Oct 2023 22:10:29 +0000 Subject: 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:f4d66514e8e6c05b2fe53d0f0c97eae5da0688d3) Merged-In: I293119e6bb0e62d12b890899e7aa02dc12de7619 Change-Id: I293119e6bb0e62d12b890899e7aa02dc12de7619 --- AndroidProducts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index bf5ac25..3bca985 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -21,5 +21,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/yukawa32.mk COMMON_LUNCH_CHOICES := \ - yukawa_sei510-userdebug \ - yukawa-userdebug + yukawa_sei510-trunk_staging-userdebug \ + yukawa-trunk_staging-userdebug -- cgit v1.2.3