From b5af3dbda6b294905e5d3bf45f1c95f7fcb77d54 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 4 Apr 2018 16:48:02 -0700
Subject: [PATCH] Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

Bug: 77599627
Test: lunch  [see entries in list]
Change-Id: I076942d135bbed92146c864f1c2961c2a2dfdf02
---
 AndroidProducts.mk |  3 +++
 vendorsetup.sh     | 17 -----------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100755 vendorsetup.sh

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 654dafc..f189694 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,6 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_taimen.mk \
+
+COMMON_LUNCH_CHOICES := \
+    aosp_taimen-userdebug
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index 39058a8..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-add_lunch_combo aosp_taimen-userdebug