Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"

am: 7a749145d9

Change-Id: Ife88f74b4bd428511560bbc5ac682eea8a780d5a
This commit is contained in:
Dan Willemsen
2018-04-04 20:28:05 -07:00
committed by android-build-merger
2 changed files with 3 additions and 17 deletions

View File

@@ -16,3 +16,6 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_taimen.mk \
COMMON_LUNCH_CHOICES := \
aosp_taimen-userdebug

View File

@@ -1,17 +0,0 @@
#
# Copyright 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.
#
add_lunch_combo aosp_taimen-userdebug