Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

Signed-off-by: Andrew F. Davis <afd@ti.com>

2 files changed, 5 insertions, 20 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 30d67c1..d23dbdb 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,8 @@
 
 PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/am65xevm_full.mk \
+
+COMMON_LUNCH_CHOICES := \
+        am65xevm_full-eng \
+        am65xevm_full-user \
+        am65xevm_full-userdebug \
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 48285ea..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
-#
-# 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 am65xevm_full-eng
-add_lunch_combo am65xevm_full-user
-add_lunch_combo am65xevm_full-userdebug
-