taoshan: Remove vendor init

* Was causing several issues with recoveries.
* C2104/C2105 don't differ significantly, so let's call them both "taoshan".
* Also, re-organize some makefiles

This reverts commit e0bd0d8.

Change-Id: I89614054c9b1108c8203c75bd679a35bd84d1433

AndroidProducts.mk

@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/taoshan.mk
+    $(LOCAL_DIR)/full_taoshan.mk

BoardConfig.mk

@@ -92,11 +92,6 @@ USE_OPENGL_RENDERER := true
 TARGET_USES_ION := true
 TARGET_USES_C2D_COMPOSITION := true
 
-# Vendor Init
-TARGET_UNIFIED_DEVICE := true
-TARGET_INIT_VENDOR_LIB := libinit_msm
-TARGET_LIBINIT_DEFINES_FILE := device/sony/taoshan/init/init_taoshan.c
-
 # Wlan
 BOARD_HAS_QCOM_WLAN              := true
 BOARD_WLAN_DEVICE                := qcwcn

cm.dependencies

@@ -3,10 +3,6 @@
     "repository": "android_device_sony_common",
     "target_path": "device/sony/common"
   },
-  {
-    "repository": "android_device_qcom_common",
-    "target_path": "device/qcom/common"
-  },
   {
     "repository": "android_kernel_sony_msm8930",
     "target_path": "kernel/sony/msm8930"

cm.mk

@@ -12,22 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, device/sony/taoshan/taoshan.mk)
+$(call inherit-product, device/sony/taoshan/full_taoshan.mk)
 
 # Enhanced NFC
 $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 
 # Inherit CM common Phone stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Boot Animation
-TARGET_SCREEN_HEIGHT := 854
-TARGET_SCREEN_WIDTH := 480
+# Set build fingerprint / ID / Prduct Name ect.
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_NAME=C2105 \
+    BUILD_FINGERPRINT="Sony/C2105/C2105:4.2.2/15.3.A.1.17/Android.1016:user/release-keys" \
+    PRIVATE_BUILD_DESC="C2105-user 4.2.2 JDQ39 Android.1016 test-keys"
 
-# Device identifier
+# Override some inherited defines
 PRODUCT_DEVICE := taoshan
 PRODUCT_NAME := cm_taoshan
-PRODUCT_BRAND := Sony
-PRODUCT_MODEL := taoshan
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_CHARACTERISTICS := phone

full_taoshan.mk

@@ -0,0 +1,33 @@
+# Copyright (C) 2014 The CyanogenMod 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.
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 854
+TARGET_SCREEN_WIDTH := 480
+
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+# Inherit common Sony resources
+$(call inherit-product, device/sony/common/resources.mk)
+
+# Inherit device config
+$(call inherit-product, device/sony/taoshan/taoshan.mk)
+
+# Device identifier
+PRODUCT_DEVICE := taoshan
+PRODUCT_NAME := full_taoshan
+PRODUCT_BRAND := Sony
+PRODUCT_MODEL := Xperia L
+PRODUCT_MANUFACTURER := Sony

taoshan.mk

@@ -13,10 +13,7 @@
 # limitations under the License.
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, vendor/sony/taoshan/taoshan-vendor.mk)
-$(call inherit-product, device/sony/common/resources.mk)
-
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
 
 # OpenGL ES 3.0