diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-04 17:47:26 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-04 17:47:26 -0700 |
commit | f8022aeaa317b74fc21a6b3a4db0ca7e35e80036 (patch) | |
tree | b085a0142bba7a10bc53ae687e041e54ddb78d80 | |
parent | daf5fd599d02bed1442f488a879471837770cd9b (diff) | |
parent | 84496432338567e25aa435e38eba0409c23cfaaa (diff) | |
download | common-f8022aeaa317b74fc21a6b3a4db0ca7e35e80036.tar.gz |
Merge "Remove vendorsetup.sh creation" am: 90cb78a769 am: b7ff69a107
am: 8449643233
Change-Id: I13a98c81ed7424ee483f4c33677aed5c3e563fc8
-rwxr-xr-x | populate-new-device.sh | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/populate-new-device.sh b/populate-new-device.sh index 09bfd8d..db5da3d 100755 --- a/populate-new-device.sh +++ b/populate-new-device.sh @@ -24,26 +24,6 @@ mkdir -p device/$1/$2 mkdir -p device/$1/$2-kernel mkdir -p vendor/$1/$2 -cat > device/$1/$2/vendorsetup.sh << EOF -# -# Copyright 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. -# - -add_lunch_combo full_$2-userdebug -EOF - cat > device/$1/$2/AndroidProducts.mk << EOF # # Copyright 2014 The Android Open-Source Project @@ -62,6 +42,8 @@ cat > device/$1/$2/AndroidProducts.mk << EOF # PRODUCT_MAKEFILES := \$(LOCAL_DIR)/full_$2.mk + +COMMON_LUNCH_CHOICES := full_$2-userdebug EOF cat > device/$1/$2/full_$2.mk << EOF |