diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-05 03:14:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-05 03:14:07 +0000 |
| commit | 4627dfc9b812d0cb3b1ba715c0dd12ae47ef9746 (patch) | |
| tree | 457118c46b279815a4bb10c21c08e3676c381467 | |
| parent | 544e69736cff911c286a5d1d300dac228e23a73f (diff) | |
| parent | 0cbe9bd1217c2574c27e8cf3cb18c7e07e5aba9f (diff) | |
| download | mini-emulator-mips-oreo-mr1-iot-release.tar.gz | |
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"HEADandroid-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.2android-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-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8nougat-iot-releasemastermain
| -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 1a713f2..fb9bfe0 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/m_e_mips.mk + +COMMON_LUNCH_CHOICES := \ + m_e_mips-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index ed2aa4b..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_mips-userdebug |