commit cdc20aa5e05005f67989d8f86b64c0526b87b76d
author Dan Willemsen <dwillemsen@google.com> Wed Apr 04 17:04:11 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Apr 04 17:04:11 2018 -0700
tree 961dbd764550a4774929f244f6ef2691b06a2c32
parent 23e15d7349fea9837c116d74acdeac621d7f6deb

Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

Bug: 77599627
Test: lunch  [see entries in list]
Change-Id: I196cf23f94ca87984ad0fee0d8c541123cac6135

AndroidProducts.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 369b2d4..c502774 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,7 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/uml.mk
\ No newline at end of file
+    $(LOCAL_DIR)/uml.mk
+
+COMMON_LUNCH_CHOICES := \
+    uml-userdebug

vendorsetup.sh

diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index fd5fc0b..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1 +0,0 @@
-add_lunch_combo uml-userdebug