diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 20:27:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-04 20:27:25 -0700 |
commit | 8dcbe3843428519bed739bae05d4f2d018435058 (patch) | |
tree | 0a055f0ef5e7459ca7db3df6b861cae7f15d6a99 | |
parent | 258706fc0ddcf2c9be48967f4766ec90efb736a5 (diff) | |
parent | 078cbd03b2073b31530845bc0e48a1a166914ec8 (diff) | |
download | mini-emulator-armv7-a-neon-8dcbe3843428519bed739bae05d4f2d018435058.tar.gz |
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 078cbd03b2
Change-Id: Ie360f330b29fd716048f31793e6bd593fc826613
-rw-r--r-- | AndroidProducts.mk | 3 | ||||
-rw-r--r-- | vendorsetup.sh | 23 |
2 files changed, 3 insertions, 23 deletions
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 |