diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 20:38:38 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-04 20:38:38 -0700 |
commit | e7cbff5118aefe44a397bc793e944b0f1eb7c84c (patch) | |
tree | 8c93387cf728f31a36b4a1ff192dd819c0028087 | |
parent | b62205d75073783e171fbcd5f675e25e57833479 (diff) | |
parent | f223f6e91c18f625a0c186b3495c1122e85320e4 (diff) | |
download | mini-emulator-x86_64-e7cbff5118aefe44a397bc793e944b0f1eb7c84c.tar.gz |
Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 47302a0e22android-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: f223f6e91c
Change-Id: I93bfe6c774a5b1a583894c833292918b2b97cd53
-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 f5f0f8b..8b818f7 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mini_emulator_x86_64.mk + +COMMON_LUNCH_CHOICES := \ + mini_emulator_x86_64-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index 849428d..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 mini_emulator_x86_64-userdebug |