diff options
| author | Greg Kaiser <gkaiser@google.com> | 2023-10-30 22:11:03 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-10-30 22:11:03 +0000 |
| commit | f544c411ce7c5bdd02e3e306879f7b6d7c1bf499 (patch) | |
| tree | 48dd055a3aae6ef8da806cfd5c3d18746c690886 | |
| parent | 5cbc16351a50447b4c04e98389919239a1f70cf3 (diff) | |
| download | poplar-f544c411ce7c5bdd02e3e306879f7b6d7c1bf499.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:e36683f026781d75008cbf9794f6a614c254f6d1)
Merged-In: I1492ec879e2131fbe5c7110573fd932712251a31
Change-Id: I1492ec879e2131fbe5c7110573fd932712251a31
| -rw-r--r-- | AndroidProducts.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1f24376..3e7e641 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -3,6 +3,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/poplar.mk COMMON_LUNCH_CHOICES := \ - poplar-eng \ - poplar-user \ - poplar-userdebug + poplar-trunk_staging-eng \ + poplar-trunk_staging-user \ + poplar-trunk_staging-userdebug |