Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9bb12bb..df8ff42 100644 (file)
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,8 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/android_x86.mk
+
+COMMON_LUNCH_CHOICES := \
+    android_x86-eng \
+    android_x86-user \
+    android_x86-userdebug

diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644 (file)
index b13fa27..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2014 The Android-x86 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 android_x86-eng
-add_lunch_combo android_x86-userdebug
-add_lunch_combo android_x86-user