Just use aosp_toro and remove full_toro.

4 files changed, 32 insertions, 50 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 840e39c..37d235a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,5 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/aosp_toro.mk \
-    $(LOCAL_DIR)/full_toro.mk
+    $(LOCAL_DIR)/aosp_toro.mk
diff --git a/aosp_toro.mk b/aosp_toro.mk
index 037da3a..50059ad 100644
--- a/aosp_toro.mk
+++ b/aosp_toro.mk
@@ -12,7 +12,36 @@
 # 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 the build configuration for a full Android
+# build for toro hardware. This cleanly combines a set of
+# device-specific aspects (drivers) with a device-agnostic
+# product configuration (apps). Except for a few implementation
+# details, it only fundamentally contains two inherit-product
+# lines, full and toro, hence its name.
 #
-$(call inherit-product, device/samsung/toro/full_toro.mk)
 
+# Camera and Gallery
+PRODUCT_PACKAGES := \
+    Gallery
+
+# Do this before aosp_base_telephony is included since the first instance takes precedence
+PRODUCT_COPY_FILES += \
+    device/samsung/toro/bcmdhd.cal:system/etc/wifi/bcmdhd.cal \
+    device/sample/etc/apns-conf_verizon.xml:system/etc/apns-conf.xml \
+    frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml
+
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+# This is where we'd set a backup provider if we had one
+#$(call inherit-product, device/sample/products/backup_overlay.mk)
+# Inherit from toro device
+$(call inherit-product, device/samsung/toro/device_vzw.mk)
+
+# Set those variables here to overwrite the inherited values.
 PRODUCT_NAME := aosp_toro
+PRODUCT_DEVICE := toro
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Galaxy Nexus
+PRODUCT_RESTRICT_VENDOR_FILES := true
diff --git a/full_toro.mk b/full_toro.mk
deleted file mode 100644
index 4ed4754..0000000
--- a/full_toro.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2011 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 the build configuration for a full Android
-# build for toro hardware. This cleanly combines a set of
-# device-specific aspects (drivers) with a device-agnostic
-# product configuration (apps). Except for a few implementation
-# details, it only fundamentally contains two inherit-product
-# lines, full and toro, hence its name.
-#
-
-# Camera and Gallery
-PRODUCT_PACKAGES := \
-    Gallery
-
-# Do this before aosp_base_telephony is included since the first instance takes precedence
-PRODUCT_COPY_FILES += \
-    device/samsung/toro/bcmdhd.cal:system/etc/wifi/bcmdhd.cal \
-    device/sample/etc/apns-conf_verizon.xml:system/etc/apns-conf.xml \
-    frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-# This is where we'd set a backup provider if we had one
-#$(call inherit-product, device/sample/products/backup_overlay.mk)
-# Inherit from toro device
-$(call inherit-product, device/samsung/toro/device_vzw.mk)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_toro
-PRODUCT_DEVICE := toro
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := AOSP on Toro
-PRODUCT_RESTRICT_VENDOR_FILES := true
diff --git a/vendorsetup.sh b/vendorsetup.sh
index b42fa96..fe52e5a 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -20,4 +20,4 @@
 # In particular, you can add lunch options with the add_lunch_combo
 # function: add_lunch_combo generic-eng
 
-add_lunch_combo full_toro-userdebug
+add_lunch_combo aosp_toro-userdebug