diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 16:51:16 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 16:51:16 -0700 |
commit | d764a91064c27a1df6186641f99399efef24f465 (patch) | |
tree | 55d20802e2ce94ec64c3a9621e75f595ad1d362a | |
parent | 5e9304bd2150508ebc0ddc45bc0ea7fcdb7fa88b (diff) | |
download | dragon-master.tar.gz |
Switch from add_lunch_combo to COMMON_LUNCH_CHOICESHEADandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-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-8oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8mastermain
Bug: 77599627
Test: lunch [see entries in list]
Change-Id: Ieacc759354189cc3d518f755d4cd29f57ec30362
-rw-r--r-- | AndroidProducts.mk | 4 | ||||
-rw-r--r-- | vendorsetup.sh | 18 |
2 files changed, 4 insertions, 18 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 5faaef4..9a46e07 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -17,3 +17,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_dragon.mk \ $(LOCAL_DIR)/aosp_dragon_car.mk + +COMMON_LUNCH_CHOICES := \ + aosp_dragon-userdebug \ + aosp_dragon-eng diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index 81e2bd8..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_dragon-userdebug -add_lunch_combo aosp_dragon-eng |