From 00f1156f771566c0050209dbe6ab741971ee4fc2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 4 Apr 2018 17:06:00 -0700 Subject: Switch from add_lunch_combo to COMMON_LUNCH_CHOICES Bug: 77599627 Test: lunch [see entries in list] Change-Id: I06e60659bf7f6362d4d939c4d71efe060d0fcb5a --- AndroidProducts.mk | 4 ++++ vendorsetup.sh | 18 ------------------ 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100755 vendorsetup.sh diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 7772b30..29f490c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -17,3 +17,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_bullhead.mk \ $(LOCAL_DIR)/aosp_bullhead_svelte.mk + +COMMON_LUNCH_CHOICES := \ + aosp_bullhead-userdebug \ + aosp_bullhead_svelte-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100755 index d0f7deb..0000000 --- a/vendorsetup.sh +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2015 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_bullhead-userdebug -add_lunch_combo aosp_bullhead_svelte-userdebug -- cgit v1.2.3