Merge "Remove vendorsetup.sh creation"
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-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 @@
#
PRODUCT_MAKEFILES := \$(LOCAL_DIR)/full_$2.mk
+
+COMMON_LUNCH_CHOICES := full_$2-userdebug
EOF
cat > device/$1/$2/full_$2.mk << EOF
