Switch from add_lunch_combo to COMMON_LUNCH_CHOICES
I'll remove the rest once they've been added to the internal branches as
appropriate.
Bug: 77599627
Test: lunch [see entries in list]
Change-Id: Ib37488b5f178c66858c87a084390135b8685d002
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 7055a67..d08f57f 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -28,3 +28,16 @@
aosp_cf_x86_tv:$(LOCAL_DIR)/vsoc_x86/tv/device.mk \
aosp_cf_x86_wear:$(LOCAL_DIR)/vsoc_x86/wear/device.mk \
+COMMON_LUNCH_CHOICES := \
+ aosp_cf_x86_auto-userdebug \
+ aosp_cf_x86_phone-userdebug \
+ aosp_cf_x86_tablet-userdebug \
+ aosp_cf_x86_tablet_3g-userdebug \
+ aosp_cf_x86_tv-userdebug \
+ aosp_cf_x86_wear-userdebug \
+ aosp_cf_x86_64_auto-userdebug \
+ aosp_cf_x86_64_phone-userdebug \
+ aosp_cf_x86_64_tablet-userdebug \
+ aosp_cf_x86_64_tablet_3g-userdebug \
+ aosp_cf_x86_64_tv-userdebug \
+ aosp_cf_x86_64_wear-userdebug
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 3f110e1..9b3e59d 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,18 +14,6 @@
# limitations under the License.
#
-add_lunch_combo aosp_cf_x86_auto-userdebug
-add_lunch_combo aosp_cf_x86_phone-userdebug
-add_lunch_combo aosp_cf_x86_tablet-userdebug
-add_lunch_combo aosp_cf_x86_tablet_3g-userdebug
-add_lunch_combo aosp_cf_x86_tv-userdebug
-add_lunch_combo aosp_cf_x86_wear-userdebug
-add_lunch_combo aosp_cf_x86_64_auto-userdebug
-add_lunch_combo aosp_cf_x86_64_phone-userdebug
-add_lunch_combo aosp_cf_x86_64_tablet-userdebug
-add_lunch_combo aosp_cf_x86_64_tablet_3g-userdebug
-add_lunch_combo aosp_cf_x86_64_tv-userdebug
-add_lunch_combo aosp_cf_x86_64_wear-userdebug
add_lunch_combo cf_x86_auto-userdebug
add_lunch_combo cf_x86_phone-userdebug
add_lunch_combo cf_x86_tablet-userdebug
