sanders: configs: Add BT SCO to routes list

Signed-off-by: Erfan Abdi <erfangplus@gmail.com>

BoardConfig.mk

@@ -35,6 +35,9 @@ TARGET_PROVIDES_KEYMASTER := true
 # Recovery
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 
+# Releasetools
+TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools
+
 # NFC
 NXP_CHIP_TYPE := PN551
 
@@ -45,9 +48,6 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 
-# Properties
-TARGET_VENDOR_PROP += $(DEVICE_PATH)/device.prop
-
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
 

aosp.dependencies

@@ -1,14 +1,66 @@
 [
   {
-      "repository":"device_motorola_msm8953-common",
-      "target_path":"device/motorola/msm8953-common",
-      "branch":"eleven",
-      "remote":"pixel-devices"
+    "repository":  "kernel_motorola_msm8953",
+    "target_path": "kernel/motorola/msm8953",
+    "branch": "ten"
   },
   {
-      "repository":"vendor_motorola_sanders",
-      "target_path":"vendor/motorola/sanders",
-      "branch":"eleven",
-      "remote":"pixel-devices-blobs"
+    "repository": "device_motorola_msm8953-common",
+    "target_path": "device/motorola/msm8953-common",
+    "branch": "ten"
+  },
+  {
+    "remote": "pixel-devices-blobs",
+    "repository": "vendor_motorola_sanders",
+    "target_path": "vendor/motorola/sanders",
+    "branch": "ten"
+  },
+  {
+    "remote": "pixel-devices-blobs",
+    "repository": "vendor_motorola_msm8953-common",
+    "target_path": "vendor/motorola/msm8953-common",
+    "branch": "ten"
+  },
+  { 
+    "remote": "lineage",
+    "repository": "android_system_qcom",
+    "target_path": "system/qcom",
+    "branch": "lineage-17.1"
+  },
+  {
+    "repository":"LineageOS/android_vendor_nxp_interfaces_opensource_nfc",
+    "target_path":"vendor/nxp/opensource/interfaces/nfc",
+    "branch":"lineage-17.1",
+    "remote":"github"
+  },
+  {
+    "repository":"LineageOS/android_vendor_nxp_opensource_external_libnfc-nci",
+    "target_path":"vendor/nxp/opensource/commonsys/external/libnfc-nci",
+    "branch":"lineage-17.1",
+    "remote":"github"
+  },
+  {
+    "repository":"LineageOS/android_vendor_nxp_opensource_frameworks",
+    "target_path":"vendor/nxp/opensource/commonsys/frameworks",
+    "branch":"lineage-17.1",
+    "remote":"github"
+  },
+  {
+    "repository":"LineageOS/android_vendor_nxp_opensource_packages_apps_Nfc",
+    "target_path":"vendor/nxp/opensource/commonsys/packages/apps/Nfc",
+    "branch":"lineage-17.1",
+    "remote":"github"
+  },
+  {
+    "repository":"LineageOS/android_vendor_nxp_opensource_halimpl",
+    "target_path":"vendor/nxp/opensource/pn5xx/halimpl",
+    "branch":"lineage-17.1-pn5xx",
+    "remote":"github"
+  },
+  {
+    "repository":"LineageOS/android_vendor_nxp_opensource_hidlimpl",
+    "target_path":"vendor/nxp/opensource/pn5xx/hidlimpl",
+    "branch":"lineage-17.1-pn5xx",
+    "remote":"github"
   }
 ]

aosp_sanders.mk

@@ -19,7 +19,7 @@ $(call inherit-product, device/motorola/sanders/device.mk)
 $(call inherit-product, vendor/aosp/config/common_full_phone.mk)
 TARGET_GAPPS_ARCH := arm64
 TARGET_BOOT_ANIMATION_RES := 1080
-TARGET_INCLUDE_LIVE_WALLPAPERS := false
+TARGET_INCLUDE_STOCK_ARCORE := true
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_BRAND := motorola

configs/check_features.sh

@@ -0,0 +1,15 @@
+#!/sbin/sh
+
+remove_dtv() {
+    rm /system/system/etc/permissions/com.motorola.hardware.dtv.xml
+    rm /system/system/etc/permissions/mot_dtv_permissions.xml
+    rm /system/system/lib*/libdtvtuner.so
+    rm /system/system/lib*/libdtvhal.so
+    rm /vendor/lib/modules/isdbt.ko
+    rm -r /system/system/priv-app/DTVPlayer
+    rm -r /system/system/priv-app/DTVService
+}
+
+if [ $(getprop ro.boot.hardware.sku) != "XT1802" ]; then
+    remove_dtv
+fi

device.mk

@@ -22,15 +22,14 @@ DEVICE_PATH := device/motorola/sanders
 DEVICE_PACKAGE_OVERLAYS += \
     $(DEVICE_PATH)/overlay
 
+# Device properties
+$(call inherit-product, $(DEVICE_PATH)/device_prop.mk)
+
 # Screen density
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 PRODUCT_AAPT_CONFIG := normal
 
 # Audio
-PRODUCT_PACKAGES += \
-    audio.primary.msm8953 \
-    libqcompostprocbundle
-
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
     $(DEVICE_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
@@ -43,9 +42,6 @@ TARGET_SCREEN_HEIGHT := 1920
 TARGET_SCREEN_WIDTH := 1080
 
 # Camera
-PRODUCT_PACKAGES += \
-    camera.device@1.0-impl
-
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/camera/imx219_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/imx219_chromatix.xml \
     $(DEVICE_PATH)/configs/camera/mot_imx258_bear_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mot_imx258_bear_chromatix.xml \
@@ -55,16 +51,6 @@ PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/camera/msm8953_mot_sanders_camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/msm8953_mot_sanders_camera.xml \
     $(DEVICE_PATH)/configs/camera/s5k4h8_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/s5k4h8_chromatix.xml
 
-# Gatekeeper HAL
-PRODUCT_PACKAGES += \
-    android.hardware.gatekeeper@1.0-impl \
-    android.hardware.gatekeeper@1.0-service
-
-# Keymaster HAL
-PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl \
-    android.hardware.keymaster@3.0-service
-
 # NFC
 PRODUCT_PACKAGES += \
     android.hardware.nfc@1.1-service \
@@ -89,6 +75,10 @@ PRODUCT_PACKAGES += \
 	fstab.qcom \
 	init.sanders.rc
 
+# Releasetools script
+PRODUCT_COPY_FILES += \
+    $(DEVICE_PATH)/configs/check_features.sh:$(TARGET_COPY_OUT_VENDOR)/bin/check_features.sh
+
 # Sensors
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf \

device.prop

@@ -1,22 +0,0 @@
-#
-# vendor props for sanders
-#
-
-# Audio
-persist.vendor.audio.calfile1=/vendor/etc/acdbdata/Bluetooth_cal.acdb
-persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Global_cal.acdb
-persist.vendor.audio.calfile2=/vendor/etc/acdbdata/General_cal.acdb
-persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb
-persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb
-persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Handset_cal.acdb
-persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Speaker_cal.acdb
-
-# Camera
-persist.vendor.camera.expose.aux=1
-ro.camera.cfa.packagelist=org.codeaurora.snapcam,com.motorola.camera2
-vendor.camera.aux.packagelist=com.motorola.camera2
-persist.camera.HAL3.enabled=1
-persist.camera.eis.enable=1
-
-# Sensors
-ro.hardware.sensors=sanders

device_prop.mk

@@ -0,0 +1,22 @@
+#
+# vendor props for sanders
+#
+
+# Audio
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.audio.calfile1=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
+    persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Global_cal.acdb \
+    persist.vendor.audio.calfile2=/vendor/etc/acdbdata/General_cal.acdb \
+    persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb \
+    persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb \
+    persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Handset_cal.acdb \
+    persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Speaker_cal.acdb
+
+# Camera
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.camera.HAL3.enabled=1 \
+    persist.camera.eis.enable=1
+
+# Sensors
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.sensors=sanders

extract-files.sh

@@ -1,13 +1,26 @@
 #!/bin/bash
 #
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS Project
+# Copyright (C) 2017-2019 The LineageOS Project
 #
-# SPDX-License-Identifier: Apache-2.0
+# 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.
+#
+
+# If we're being sourced by the common script that we called,
+# stop right here. No need to go down the rabbit hole.
 
 function blob_fixup() {
     case "${1}" in
+
     vendor/lib/hw/camera.msm8953.so)
         sed -i "s|service.bootanim.exit|service.bootanim.hold|g" "${2}"
         ;;
@@ -27,19 +40,21 @@ function blob_fixup() {
     vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-fpcservice)
         sed -i 's|/firmware/image|/vendor/f/image|' "${2}"
         ;;
+
    esac
 }
 
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
 if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
     return
 fi
 
 set -e
 
+# Required!
 export DEVICE=sanders
 export DEVICE_COMMON=msm8953-common
 export VENDOR=motorola
 
+export DEVICE_BRINGUP_YEAR=2020
+
 "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"

proprietary-files.txt

@@ -554,6 +554,16 @@ vendor/firmware/focaltech-biel-ft5436-06-0001-sanders.bin
 vendor/firmware/focaltech-djn-ft5436-02-0001-sanders.bin
 vendor/firmware/focaltech-toptouch-ft5436-0a-0001-sanders.bin
 
+# DTV
+-app/DTVPlayer/DTVPlayer.apk
+-app/DTVService/DTVService.apk
+etc/permissions/com.motorola.hardware.dtv.xml
+etc/permissions/mot_dtv_permissions.xml
+lib/libdtvhal.so
+lib/libdtvtuner.so
+lib64/libdtvhal.so
+lib64/libdtvtuner.so
+
 # Gatekeeper - from LA.UM.8.6.r1-04700-89xx.0
 vendor/lib64/hw/gatekeeper.msm8953.so|b3a9d78faa65029b0a20f2ff6dfe986bc80b64c1
 

releasetools/releasetools.py

@@ -0,0 +1,28 @@
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS 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.
+
+
+def IncrementalOTA_InstallEnd(info):
+  ReplaceDeviceConfig(info)
+
+def FullOTA_InstallEnd(info):
+  ReplaceDeviceConfig(info)
+
+def ReplaceDeviceConfig(info):
+  info.script.Mount("/system")
+  info.script.Mount("/vendor")
+  info.script.AppendExtra('run_program("/sbin/sh", "/vendor/bin/check_features.sh");')
+  info.script.Unmount("/system")
+  info.script.Unmount("/vendor")

rootdir/etc/fstab.qcom

@@ -10,8 +10,10 @@
 /dev/block/bootdevice/by-name/misc          /misc		      emmc	defaults					                                                          defaults
 /dev/block/bootdevice/by-name/modem         /vendor/firmware_mnt      ext4	ro,nosuid,nodev,context=u:object_r:firmware_file:s0	                                                  wait
 /dev/block/bootdevice/by-name/dsp           /vendor/dsp		      ext4	ro,nosuid,nodev,barrier=1,defcontext=u:object_r:adsprpcd_file:s0	                                  wait
-/dev/block/bootdevice/by-name/fsg	    /vendor/fsg		      ext4	ro,nosuid,nodev,context=u:object_r:fsg_firmware_file:s0                                                   wait
+/dev/block/bootdevice/by-name/bluetooth     /vendor/bt_firmware       ext4      ro,nosuid,nodev,context=u:object_r:bt_firmware_file:s0                                                    wait
+/dev/block/bootdevice/by-name/fsg           /vendor/fsg               ext4      ro,nosuid,nodev,context=u:object_r:fsg_file:s0                                                            wait
 /dev/block/bootdevice/by-name/persist       /mnt/vendor/persist	      ext4	noatime,nosuid,nodev,barrier=1	                                                                          wait
+
 /devices/*/xhci-hcd.*.auto/usb*	            auto		      auto	defaults					                                                          voldmanaged=usb:auto
 /devices/soc/7864900.sdhci/mmc_host*        auto		      auto	nosuid,nodev					                                                          wait,voldmanaged=sdcard1:auto,encryptable=footer
 /dev/block/zram0		            none		      swap	defaults					                                                          zramsize=536870912

rootdir/etc/init.sanders.rc

@@ -43,4 +43,7 @@ on boot
 
 on post-fs-data
     mkdir /data/fpc 0700 system system
-    mkdir /data/.fps 0770 system oem_5015
+    mkdir /data/.fps 0770 system fingerp
+
+on property:ro.boot.hardware.sku=XT1802
+    insmod /vendor/lib/modules/isdbt.ko

setup-makefiles.sh

@@ -1,15 +1,27 @@
 #!/bin/bash
 #
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS Project
+# Copyright (C) 2017-2019 The LineageOS Project
 #
-# SPDX-License-Identifier: Apache-2.0
+# 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.
 #
 
 set -e
 
+# Required!
 export DEVICE=sanders
 export DEVICE_COMMON=msm8953-common
 export VENDOR=motorola
 
+export DEVICE_BRINGUP_YEAR=2020
+
 "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"