diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-05 03:14:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-05 03:14:07 +0000 |
| commit | 7cb47bdd6c605e6439b644fb2a6397af605745c4 (patch) | |
| tree | 9a0c64c68595d934d14b62ca27ec3d90a52a00c8 | |
| parent | 09f52d6d55e3bc6893a96104011eca320855b94f (diff) | |
| parent | 05ed9d4e90b8bec859c46a8d1e181178f7961922 (diff) | |
| download | hikey-7cb47bdd6c605e6439b644fb2a6397af605745c4.tar.gz | |
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
| -rw-r--r-- | AndroidProducts.mk | 13 | ||||
| -rwxr-xr-x | vendorsetup.sh | 25 |
2 files changed, 9 insertions, 29 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1b16eec2..1fc71292 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -10,7 +10,12 @@ # PRODUCT_MAKEFILES := \ -$(LOCAL_DIR)/hikey.mk \ -$(LOCAL_DIR)/hikey32.mk \ -$(LOCAL_DIR)/hikey64_only.mk \ -$(LOCAL_DIR)/hikey960.mk + $(LOCAL_DIR)/hikey.mk \ + $(LOCAL_DIR)/hikey32.mk \ + $(LOCAL_DIR)/hikey64_only.mk \ + $(LOCAL_DIR)/hikey960.mk + +COMMON_LUNCH_CHOICES := \ + hikey-userdebug \ + hikey64_only-userdebug \ + hikey960-userdebug diff --git a/vendorsetup.sh b/vendorsetup.sh deleted file mode 100755 index cef0a194..00000000 --- a/vendorsetup.sh +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2013 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 hikey-userdebug -add_lunch_combo hikey64_only-userdebug -add_lunch_combo hikey960-userdebug |