Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 47302a0e22 am: f223f6e91c
am: e7cbff5118

Change-Id: I558f3f117d1598c56bf392d1e57c64a3a89c9c22
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index f5f0f8b..8b818f7 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,6 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/mini_emulator_x86_64.mk
+
+COMMON_LUNCH_CHOICES := \
+    mini_emulator_x86_64-userdebug
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 849428d..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2012 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.
-#
-
-# This file is executed by build/envsetup.sh, and can use anything
-# defined in envsetup.sh.
-#
-# In particular, you can add lunch options with the add_lunch_combo
-# function: add_lunch_combo generic-eng
-
-add_lunch_combo mini_emulator_x86_64-userdebug