diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 16:56:58 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 16:56:58 -0700 |
| commit | 46db904d78e3f3517a2b7f5b41b408ba5d69ead6 (patch) | |
| tree | 147f4dd2beea111f5be40949a282acccaa0cd544 | |
| parent | 14e68384a8f8be2ed9fde28fa4255a1c47dc731a (diff) | |
| download | car-o-mr1-iot-preview-8.tar.gz | |
Switch from add_lunch_combo to COMMON_LUNCH_CHOICESandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8o-mr1-iot-preview-8
Bug: 77599627
Test: lunch [see entries in list]
Change-Id: I1e820e52b582b31947d7ac4597f4e9cf38334dd0
| -rw-r--r-- | AndroidProducts.mk | 6 | ||||
| -rw-r--r-- | vendorsetup.sh | 26 |
2 files changed, 6 insertions, 26 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index eae3b59..50c5cad 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -19,3 +19,9 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_car_arm.mk \ $(LOCAL_DIR)/aosp_car_x86.mk \ $(LOCAL_DIR)/aosp_car_x86_64.mk \ + +COMMON_LUNCH_CHOICES := \ + aosp_car_arm-userdebug \ + aosp_car_arm64-userdebug \ + aosp_car_x86-userdebug \ + aosp_car_x86_64-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index 4e87161..0000000 --- a/vendorsetup.sh +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2017 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 aosp_car_arm-userdebug -add_lunch_combo aosp_car_arm64-userdebug -add_lunch_combo aosp_car_x86-userdebug -add_lunch_combo aosp_car_x86_64-userdebug |