summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-05-04 17:35:55 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-04 17:35:55 -0700
commitb7ff69a1075dce7c5b771e62142cb39691e8ee3b (patch)
tree9b2f97448be62b46445332715114cacfcbe03070
parentd79c788169a8054ab742cb038173888a24dedb04 (diff)
parent90cb78a769f20a8fba99e8a67d394038cdf35cbf (diff)
downloadcommon-b7ff69a1075dce7c5b771e62142cb39691e8ee3b.tar.gz
Merge "Remove vendorsetup.sh creation"
am: 90cb78a769 Change-Id: I444d9c47baf8aecd4dbe64f917051ec2c60d8ae1
-rwxr-xr-xpopulate-new-device.sh22
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