summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-04-04 20:38:20 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-04 20:38:20 -0700
commit595ad51d88bfbd3e680b290b69bbb28f6ee41f27 (patch)
tree12b4ba4b5c1c62465cd8983e0f0e95f89e9c5b5f
parent77d394326f7fc17831ee7702cb8b750fe0b21443 (diff)
parent43c68cca08c4ee22d5cb1fc3f5b7533775b2c848 (diff)
downloadmini-emulator-arm64-595ad51d88bfbd3e680b290b69bbb28f6ee41f27.tar.gz
am: 43c68cca08 Change-Id: I6341a922766eb726d5bcca57bf380d840b4becf6
-rw-r--r--AndroidProducts.mk3
-rw-r--r--vendorsetup.sh22
2 files changed, 3 insertions, 22 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 41ba3c8..36c2e97 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,3 +15,6 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/mini_emulator_arm64.mk
+
+COMMON_LUNCH_CHOICES := \
+ mini_emulator_arm64-userdebug
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index c1d2b3d..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2014 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_arm64-userdebug