diff options
| author | Greg Kaiser <gkaiser@google.com> | 2023-10-30 22:10:58 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-10-30 22:10:58 +0000 |
| commit | d319529aedcdfa0a84117a7a96ec9b67dd2056e7 (patch) | |
| tree | 16215297aceebcbd8a363fdc9c2299be171896c5 | |
| parent | 81dda7b637100caa0cddff64c52394cf3206d597 (diff) | |
| download | hikey-d319529aedcdfa0a84117a7a96ec9b67dd2056e7.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:406d7ae8afcea82f227278b2c20198ce94b143ca)
Merged-In: Iba97af30d474696210b68f5b35604bf04b953896
Change-Id: Iba97af30d474696210b68f5b35604bf04b953896
| -rw-r--r-- | AndroidProducts.mk | 10 |
1 files 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 |