Move toro spr files to torospr.

This reverts change 157972 and 157014, both of which hacked toro spr support
into device/samsung/toro.

Change-Id: Ife4879ed22bc7261047bf8e3098f3c7114b183c1
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0f90dc1..8545718 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,5 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_toro.mk \
-    $(LOCAL_DIR)/full_toro_spr.mk
+    $(LOCAL_DIR)/full_toro.mk
diff --git a/board-info.txt b/board-info.txt
index de7bef2..4f9bcf4 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,5 +1,5 @@
 require board=tuna
-require version-bootloader=PRIMEKK15|PRIMEKL01|PRIMESPH-L700EL01
-require version-baseband=I515.EK02|I515.EK04|I515.EL01|L700.EL04
-require version-cdma=I515.EK05|I515.EK06|I515.EK09|L700.EL04
+require version-bootloader=PRIMEKK15|PRIMEKL01
+require version-baseband=I515.EK02|I515.EK04|I515.EL01
+require version-cdma=I515.EK05|I515.EK06|I515.EK09
 
diff --git a/device_spr.mk b/device_spr.mk
deleted file mode 100644
index e6b4b11..0000000
--- a/device_spr.mk
+++ /dev/null
@@ -1,22 +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 includes all definitions that apply only to toro devices
-#
-# Anything that is generic to all tuna products should go in the tuna directory
-#
-# Everything in this directory will become public
-
-$(call inherit-product, device/samsung/toro/device.mk)
-$(call inherit-product-if-exists, vendor/samsung/toro_spr/device-vendor.mk)
diff --git a/full_toro_spr.mk b/full_toro_spr.mk
deleted file mode 100644
index d8cb495..0000000
--- a/full_toro_spr.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
-PRODUCT_PACKAGES := \
-    Camera \
-    Gallery
-
-#if we do this after the full_base_telephony is included some of these don't get picked up..
-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/base/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/full_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_spr.mk)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_toro_spr
-PRODUCT_DEVICE := toro
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Full AOSP on Toro-SPR
diff --git a/recovery/Android.mk b/recovery/Android.mk
index ceb5cc7..e2552f9 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),toro)
+ifneq (,$(findstring $(TARGET_DEVICE),toro torospr))
 
 # Edify extension functions for doing modem (radio) updates on Toro devices.
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index c3bc29b..f3239ab 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -15,4 +15,3 @@
 #
 
 add_lunch_combo full_toro-userdebug
-add_lunch_combo full_toro_spr-userdebug