summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-04-04 20:45:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-04 20:45:25 -0700
commitae91465bbe98d260277a4f93c177e3a6b0f888a6 (patch)
tree961dbd764550a4774929f244f6ef2691b06a2c32
parent5ff90bb48866267b91321f1e3b5b205981fbf889 (diff)
parent7ef166a2b30b2d854f20f35ba8a3138ae295b40d (diff)
downloaduml-ae91465bbe98d260277a4f93c177e3a6b0f888a6.tar.gz
Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: cdc20aa5e0 am: 6de7eff7c0
am: 7ef166a2b3 Change-Id: I3bea83cf591a5f6e38efc956b2d2f918eb9e6181
-rw-r--r--AndroidProducts.mk5
-rwxr-xr-xvendorsetup.sh1
2 files changed, 4 insertions, 2 deletions
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
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