msm8916: Remove deprecated flags, bring in line with 8939-common

* Remove DEEP_BUFFER_RINGTONE (unimplemented)
* Remove EXTENDED_FONT_CONFIG
* Remove system properties that set the defaults

Change-Id: I93b6a36a9c995840bb13e8b788b713c34485484d

2 files changed, 32 insertions, 51 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ee37214..3c71179 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -23,10 +23,6 @@ TARGET_CYANOGEN_COMMON := msm8916
 TARGET_BOARD_PLATFORM := msm8916
 TARGET_BOARD_PLATFORM_GPU := qcom-adreno306
 
-# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := MSM8916
-TARGET_NO_BOOTLOADER := true
-
 # Architecture
 ifneq ($(FORCE_32_BIT),true)
 TARGET_BOARD_SUFFIX := _64
@@ -55,30 +51,32 @@ endif
 # Properties (reset them here, include more in device if needed)
 TARGET_SYSTEM_PROP := $(VENDOR_PATH)/system.prop
 
+# Bootloader
+TARGET_BOOTLOADER_BOARD_NAME := MSM8916
+TARGET_NO_BOOTLOADER := true
+
 # Kernel
+BOARD_DTBTOOL_ARGS := -2
 BOARD_KERNEL_BASE := 0x80000000
 BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_KERNEL_SEPARATED_DT := true
 BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
 BOARD_RAMDISK_OFFSET     := 0x02000000
-BOARD_DTBTOOL_ARGS := -2
+TARGET_KERNEL_SOURCE := kernel/cyanogen/msm8916
 ifneq ($(FORCE_32_BIT),true)
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_HEADER_ARCH := arm64
-
 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
 TARGET_USES_UNCOMPRESSED_KERNEL := true
 else
 TARGET_KERNEL_ARCH := arm
 endif
-TARGET_KERNEL_SOURCE := kernel/cyanogen/msm8916
 
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
 
 # Audio
-AUDIO_FEATURE_DEEP_BUFFER_RINGTONE := true
 AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true
 AUDIO_FEATURE_ENABLED_NEW_SAMPLE_RATE := true
 AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true
@@ -94,9 +92,6 @@ BLUETOOTH_HCI_USE_MCT := true
 BOARD_USES_CYANOGEN_HARDWARE := true
 BOARD_HARDWARE_CLASS += hardware/cyanogen/cmhw
 
-# malloc implementation
-MALLOC_IMPL := dlmalloc
-
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
 
@@ -123,17 +118,22 @@ USE_OPENGL_RENDERER := true
 AUDIO_FEATURE_ENABLED_FM := true
 TARGET_QCOM_NO_FM_FIRMWARE := true
 
-# Fonts
-EXTENDED_FONT_FOOTPRINT := true
-
 # Init
 TARGET_INIT_VENDOR_LIB := libinit_msm
 TARGET_PLATFORM_DEVICE_BASE := /devices/soc.0/
 
+# Malloc
+MALLOC_IMPL := dlmalloc
+
 # Power
 TARGET_POWERHAL_VARIANT := qcom
 
 # Qualcomm support
+BOARD_USES_QC_TIME_SERVICES := true
+ifneq ($(QCPATH),)
+BOARD_USES_QCNE := true
+TARGET_LDPRELOAD := libNimsWrap.so
+endif
 BOARD_USES_QCOM_HARDWARE := true
 
 # Recovery
@@ -151,15 +151,6 @@ include device/qcom/sepolicy/sepolicy.mk
 BOARD_SEPOLICY_DIRS += \
     $(VENDOR_PATH)/sepolicy
 
-# Time services
-BOARD_USES_QC_TIME_SERVICES := true
-
-# QC PROPRIETARY
-ifneq ($(QCPATH),)
-BOARD_USES_QCNE := true
-TARGET_LDPRELOAD := libNimsWrap.so
-endif
-
 # Video
 TARGET_HAVE_SIGNED_VENUS_FW := true
 
diff --git a/system.prop b/system.prop
index 6249b1c..cbafc2e 100644
--- a/system.prop
+++ b/system.prop
@@ -1,8 +1,13 @@
 # Art
 dalvik.vm.dex2oat-flags=--no-watch-dog
+ro.config.max_starting_bg=8
+
+# ActivityManager
+ro.config.max_starting_bg=8
+ro.sys.fw.bservice_enable=true
+ro.sys.fw.use_trim_settings=true
 
 # Audio
-tunnel.audio.encode=false
 av.offload.enable=true
 av.streaming.offload.enable=true
 audio.offload.buffer.size.kb=64
@@ -13,14 +18,6 @@ audio.offload.pcm.24bit.enable=true
 use.voice.path.for.pcm.voip=true
 vidc.enc.narrow.searchrange=1
 
-# Media
-mm.enable.smoothstreaming=true
-mm.disable.sec_smoothstreaming=true
-media.aac_51_output_enabled=true
-
-# set max starting background services
-ro.config.max_starting_bg=8
-
 # Bluetooth
 ro.qualcomm.bt.hci_transport=smd
 
@@ -39,6 +36,12 @@ ro.gps.agps_provider=1
 ro.qc.sdk.izat.premium.enabled=0
 ro.qc.sdk.izat.service_mask=0x0
 
+# Media
+mm.enable.smoothstreaming=true
+mm.disable.sec_smoothstreaming=true
+media.aac_51_output_enabled=true
+drm.service.enabled=1
+
 # NITZ
 persist.rild.nitz_plmn=
 persist.rild.nitz_long_ons_0=
@@ -50,29 +53,16 @@ persist.rild.nitz_short_ons_1=
 persist.rild.nitz_short_ons_2=
 persist.rild.nitz_short_ons_3=
 
-# Radio
-persist.radio.apm_sim_not_pwdn=1
-rild.libargs=-d /dev/smd0
-
-ro.use_data_netmgrd=true
-
-# Time
-persist.timed.enable=true
-
 # perf
 ro.core_ctl_min_cpu=2
 ro.core_ctl_max_cpu=4
 ro.min_freq_0=800000
 ro.vendor.extension_library=libqti-perfd-client.so
 
-#Trim properties
-ro.sys.fw.use_trim_settings=true
-ro.sys.fw.empty_app_percent=50
-ro.sys.fw.trim_empty_percent=100
-ro.sys.fw.trim_cache_percent=100
-ro.sys.fw.trim_enable_memory=1073741824
+# Radio
+persist.radio.apm_sim_not_pwdn=1
+rild.libargs=-d /dev/smd0
+ro.use_data_netmgrd=true
 
-#Enable B service adj transition by default
-ro.sys.fw.bservice_enable=true
-ro.sys.fw.bservice_limit=5
-ro.sys.fw.bservice_age=5000
+# Time
+persist.timed.enable=true