From d319529aedcdfa0a84117a7a96ec9b67dd2056e7 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Mon, 30 Oct 2023 22:10:58 +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:406d7ae8afcea82f227278b2c20198ce94b143ca) Merged-In: Iba97af30d474696210b68f5b35604bf04b953896 Change-Id: Iba97af30d474696210b68f5b35604bf04b953896 --- AndroidProducts.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9193abca..12912923 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -18,8 +18,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/hikey960_tv.mk COMMON_LUNCH_CHOICES := \ - hikey-userdebug \ - hikey64_only-userdebug \ - hikey_tv-userdebug \ - hikey960-userdebug \ - hikey960_tv-userdebug + hikey-trunk_staging-userdebug \ + hikey64_only-trunk_staging-userdebug \ + hikey_tv-trunk_staging-userdebug \ + hikey960-trunk_staging-userdebug \ + hikey960_tv-trunk_staging-userdebug -- cgit v1.2.3