summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2019-02-07 15:28:47 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-07 15:28:47 -0800
commitfb568f768c684348456cc761567af7211c6142b7 (patch)
tree972f2ce5c8e0c72768b27a60e7b0a713eebff8c9
parentbb7917300b7f8d14ee8108463b7d62f79c6d016b (diff)
parentf2ef36757033267d7d52b6f1f214b71f97dbde2a (diff)
downloaddevice_generic_trusty-fb568f768c684348456cc761567af7211c6142b7.tar.gz
device_generic_trusty-fb568f768c684348456cc761567af7211c6142b7.tar.bz2
device_generic_trusty-fb568f768c684348456cc761567af7211c6142b7.zip
Replace vendorsetup.sh with COMMON_LUNCH_CHOICES am: f14468f373
am: f2ef367570 Change-Id: I69c410dbc3b566170170eb5bbfa22cec1c36c70e
-rw-r--r--AndroidProducts.mk2
-rw-r--r--vendorsetup.sh22
2 files changed, 2 insertions, 22 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 431511e..0568c1e 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,3 +15,5 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/qemu_trusty_arm64.mk
+
+COMMON_LUNCH_CHOICES := qemu_trusty_arm64-userdebug
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 350b3ce..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2018-2019 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 qemu_trusty_arm64-userdebug