diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 20:27:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-04 20:27:34 -0700 |
| commit | f2d082c5863fc2a660a165f68dc4ddc73cdd0463 (patch) | |
| tree | fe500695e7001a040b25592e8499e616f00ecd3a | |
| parent | 65d59e2be2cfd713513a05d80a0f75794ab60579 (diff) | |
| parent | 152ea797fd07b76d87f83a343bdc58ad2c762028 (diff) | |
| download | mini-emulator-x86-f2d082c5863fc2a660a165f68dc4ddc73cdd0463.tar.gz | |
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 152ea797fd
Change-Id: I26260647428a95e62c9afef5f3e6e14067e6a622
| -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 c739d36..6726eb6 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,3 +16,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/mini_emulator_x86.mk + +COMMON_LUNCH_CHOICES := \ + mini_emulator_x86-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100644 index 96025d9..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-userdebug |