From ce06d6552ac71c256089575456b92d2e0c2b75df Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 4 Apr 2018 16:59:25 -0700 Subject: Switch from add_lunch_combo to COMMON_LUNCH_CHOICES Bug: 77599627 Test: lunch [see entries in list] Change-Id: I9d0f6067b004744290756579a7d88f3e274ccabf --- AndroidProducts.mk | 3 +++ vendorsetup.sh | 23 ----------------------- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 vendorsetup.sh diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 0e562c4..1b38b0c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/m_e_arm.mk + +COMMON_LUNCH_CHOICES := \ + m_e_arm-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index d87ff34..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 m_e_arm-userdebug -- cgit v1.2.3