taoshan: decouple from 8960-common

Change-Id: I2384ca31511ffc786fa2bce2c8e1ff220303cc00

BoardConfig.mk

@@ -12,13 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# inherit from msm8960-common
-include device/sony/msm8960-common/BoardConfigCommon.mk
+# Inherit from Sony common
+include device/sony/common/BoardConfigCommon.mk
 
 USE_CAMERA_STUB := false
 
+# Architecture
+TARGET_ARCH := arm
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_VARIANT := krait
+
 BOARD_VENDOR_PLATFORM := taoshan
 TARGET_BOOTLOADER_BOARD_NAME := qcom
+TARGET_BOARD_PLATFORM := msm8960
 
 TARGET_OTA_ASSERT_DEVICE := C2105,C2104,c2105,c2104,taoshan
 
@@ -49,6 +57,13 @@ TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/msm_hsusb/gadget/lun%d/
 TARGET_KERNEL_SOURCE := kernel/sony/msm8930
 TARGET_KERNEL_CONFIG := cyanogenmod_taoshan_defconfig
 
+# Board overrides
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_RADIOIMAGE := true
+
+# Bionic
+MALLOC_IMPL := dlmalloc
+
 # MMap compatibility
 BOARD_USES_LEGACY_MMAP := true
 
@@ -60,17 +75,25 @@ TARGET_SPECIFIC_HEADER_PATH += device/sony/taoshan/include
 BOARD_RIL_NO_CELLINFOLIST := true
 
 # Audio
+BOARD_USES_ALSA_AUDIO := true
 BOARD_USES_LEGACY_ALSA_AUDIO := true
 TARGET_USES_QCOM_COMPRESSED_AUDIO := true
 AUDIO_FEATURE_ENABLED_FM := true
 QCOM_FM_ENABLED := true
 
 TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
 
+# Camera
+TARGET_PROVIDES_CAMERA_HAL := true
 USE_DEVICE_SPECIFIC_CAMERA := true
 COMMON_GLOBAL_CFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS
 COMMON_GLOBAL_CFLAGS += -DSONY_CAM_PARAMS
 
+# Display HAL
+USE_OPENGL_RENDERER := true
+TARGET_USES_ION := true
+TARGET_USES_C2D_COMPOSITION := true
+
 # RIL
 BOARD_PROVIDES_LIBRIL := true
 
@@ -93,10 +116,23 @@ WIFI_DRIVER_FW_PATH_STA          := "sta"
 WIFI_DRIVER_FW_PATH_AP           := "ap"
 
 # Bluetooth
+BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_QCOM := true
+BLUETOOTH_HCI_USE_MCT := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/taoshan/bluetooth
 
 BOARD_RIL_NO_SEEK := true
 
+# Lights HAL
+TARGET_PROVIDES_LIBLIGHT := true
+
+# Power HAL
+TARGET_POWERHAL_VARIANT := qcom
+CM_POWERHAL_EXTENSION := qcom
+
+# QCOM hardware
+BOARD_USES_QCOM_HARDWARE := true
+
 # Recovery
 TARGET_RECOVERY_FSTAB = device/sony/taoshan/rootdir/root/fstab.qcom
 BOARD_HAS_NO_SELECT_BUTTON := true
@@ -111,6 +147,12 @@ BOARD_HARDWARE_CLASS := device/sony/taoshan/cmhw
 
 TARGET_USES_LOGD := false
 
+# RIL
+BOARD_RIL_CLASS := ../../../device/sony/taoshan/ril/
+
+# Font expansion
+EXTENDED_FONT_FOOTPRINT := true
+
 # inherit qcom common sepolicies
 include device/qcom/sepolicy/sepolicy.mk
 

cm.dependencies

@@ -1,7 +1,11 @@
 [
   {
-    "repository": "android_device_sony_msm8960-common",
-    "target_path": "device/sony/msm8960-common"
+    "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",

liblights/Android.mk

@@ -0,0 +1,19 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+ifneq ($(strip $(TARGET_DISPLAY_GAMMA_DISABLED)),true)
+    LOCAL_CFLAGS += -DENABLE_GAMMA_CORRECTION
+endif
+
+LOCAL_SRC_FILES := \
+    lights.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+    libhardware liblog libutils libcutils
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw
+LOCAL_MODULE := lights.msm8960
+
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)