diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-04-04 20:28:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-04 20:28:01 -0700 |
| commit | 8ee20030f501ca30980484dba5f1380fef54d8ef (patch) | |
| tree | 6bef645529755c6444a5f9b5ba77e24fc257d902 | |
| parent | 43a1727190ef617620b33e7be3aee27a7b541302 (diff) | |
| parent | 2b111ebde66fa7229b0a5e3f2b29d5d7687b520b (diff) | |
| download | muskie-8ee20030f501ca30980484dba5f1380fef54d8ef.tar.gz | |
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 2b111ebde6
Change-Id: Iafecb942ed0fd4087b92a660a3a26bd1e2016034
| -rw-r--r-- | AndroidProducts.mk | 4 | ||||
| -rwxr-xr-x | vendorsetup.sh | 18 |
2 files changed, 4 insertions, 18 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9357a8a..0ae0891 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -17,3 +17,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_walleye.mk \ $(LOCAL_DIR)/aosp_walleye_test.mk \ + +COMMON_LUNCH_CHOICES := \ + aosp_walleye-userdebug \ + aosp_walleye_test-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100755 index 2d8c55b..0000000 --- a/vendorsetup.sh +++ /dev/null @@ -1,18 +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_walleye-userdebug -add_lunch_combo aosp_walleye_test-userdebug |