From 7a269643e740999b7005ba512b11a4c6df170df9 Mon Sep 17 00:00:00 2001
From: Josh Shafran
Date: Tue, 30 Jul 2019 01:16:20 +0000
Subject: j721e: Migrate away from vendorsetup.sh for lunch

Update method of adding a lunch combo from Oreo-MR1 to current.
Remove vendorsetup.sh because this file is depreciated.
Update AndroidProducts.mk to add COMMON_LUNCH_CHOICES
and PRODUCT_MAKEFILES for each TARGET_PRODUCT.

Signed-off-by: Josh Shafran <j-shafran@ti.com>
---
 AndroidProducts.mk |  7 ++++++-
 vendorsetup.sh     | 20 --------------------
 2 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 vendorsetup.sh

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index b283aeb..f5d62aa 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-	$(LOCAL_DIR)/j721e_full.mk \
+    j721e_full:$(LOCAL_DIR)/j721e_full.mk \
+
+COMMON_LUNCH_CHOICES := \
+    j721e_full-eng \
+    j721e_full-user \
+    j721e_full-userdebug \
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 51aa0e4..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2019 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 j721e_full-eng
-add_lunch_combo j721e_full-user
-add_lunch_combo j721e_full-userdebug
-
-- 
cgit v1.2.3-54-g00ecf