From eecbe763928b130f3f8779eb890e0328b02115bf Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Mon, 30 Oct 2023 22:00:32 +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:2d13c2fd2bbc1164beca59490ca0f1c88c25a256) Merged-In: I441fde351191dfa28e48a54538249be57310971f Change-Id: I441fde351191dfa28e48a54538249be57310971f --- AndroidProducts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ac74518..b608428 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -21,4 +21,4 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ - aosp_felix-userdebug + aosp_felix-trunk_staging-userdebug