| commit | 99f12f480ad67438ac64fcafa2d027055742d593 | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Mon Oct 30 22:00:57 2023 +0000 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Oct 30 22:00:57 2023 +0000 |
| tree | 1fb0fad7439452511dff29efc7da2db225ffa840 | |
| parent | 8c24309054049752e970308fd62e5913e965a1b8 [diff] |
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:08176b5882ebf16aed25d650aa474b3dc3d05c96) Merged-In: I9778ab070155d18d4c67f31c9ff39863e7ba34af Change-Id: I9778ab070155d18d4c67f31c9ff39863e7ba34af
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index c2c8efe..ce06e54 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk
@@ -39,7 +39,7 @@ $(LOCAL_DIR)/factory_whitefin.mk COMMON_LUNCH_CHOICES := \ - aosp_slider-userdebug \ - aosp_whitefin-userdebug \ - aosp_oriole-userdebug \ - aosp_raven-userdebug + aosp_slider-trunk_staging-userdebug \ + aosp_whitefin-trunk_staging-userdebug \ + aosp_oriole-trunk_staging-userdebug \ + aosp_raven-trunk_staging-userdebug