summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kaiser <gkaiser@google.com>2023-10-30 22:01:04 +0000
committerAndroid Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com>2023-10-30 22:01:04 +0000
commit95edaa292e665b2ddb1cfe3cec98b47ebd7f2b54 (patch)
tree9578b9fc264323aa1c43f16ecc58555657f006d2
parente3ab1a70e661695f36c8ae0cf0271ddbad8a413f (diff)
downloadredfin-95edaa292e665b2ddb1cfe3cec98b47ebd7f2b54.tar.gz
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:1b54ce4db1a3c3ba067124a7e491ae29f8e50666) Merged-In: I400392ba9cf7e6d35af78d6b668d52abee27497d Change-Id: I400392ba9cf7e6d35af78d6b668d52abee27497d
-rw-r--r--AndroidProducts.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 1dc1835..bea4981 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -22,5 +22,5 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_redfin_hwasan.mk \
COMMON_LUNCH_CHOICES := \
- aosp_redfin-userdebug \
- aosp_redfin_vf-userdebug \
+ aosp_redfin-trunk_staging-userdebug \
+ aosp_redfin_vf-trunk_staging-userdebug \