diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 20:38:23 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-04 20:38:23 -0700 |
commit | c65b46a1a0d89411e666244423555c860413e911 (patch) | |
tree | 0a055f0ef5e7459ca7db3df6b861cae7f15d6a99 | |
parent | 258706fc0ddcf2c9be48967f4766ec90efb736a5 (diff) | |
parent | 8dcbe3843428519bed739bae05d4f2d018435058 (diff) | |
download | mini-emulator-armv7-a-neon-c65b46a1a0d89411e666244423555c860413e911.tar.gz |
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 078cbd03b2android-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 8dcbe38434
Change-Id: Ia52568e4f03ece7a800c81c54207819063d41546
-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 |