sanders: Add the necessary dependencies for official builds

Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>
sanders: Switch to standalone extract utils
2021-03-25 00:09:27 -03:00 · 2021-03-21 09:39:06 -03:00 · 2021-03-21 09:36:47 -03:00 · 2021-03-21 09:36:24 -03:00 · 2021-03-21 09:36:06 -03:00 · 2021-03-21 09:36:06 -03:00
13 changed files with 68 additions and 195 deletions
@@ -35,9 +35,6 @@ 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

@@ -48,6 +45,9 @@ 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)

@@ -1,66 +1,14 @@
 [
   {
-    "repository":  "kernel_motorola_msm8953",
-    "target_path": "kernel/motorola/msm8953",
-    "branch": "ten"
+      "repository":"device_motorola_msm8953-common",
+      "target_path":"device/motorola/msm8953-common",
+      "branch":"eleven",
+      "remote":"pixel-devices"
   },
   {
-    "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"
+      "repository":"vendor_motorola_sanders",
+      "target_path":"vendor/motorola/sanders",
+      "branch":"eleven",
+      "remote":"pixel-devices-blobs"
   }
 ]
@@ -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_STOCK_ARCORE := true
+TARGET_INCLUDE_LIVE_WALLPAPERS := false

 ## Device identifier. This must come after all inclusions
 PRODUCT_BRAND := motorola
@@ -1,15 +0,0 @@
-#!/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
@@ -22,14 +22,15 @@ 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 \
@@ -42,6 +43,9 @@ 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 \
@@ -51,6 +55,16 @@ 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 \
@@ -75,10 +89,6 @@ 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 \
@@ -0,0 +1,22 @@
+#
+# 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
@@ -1,22 +0,0 @@
-#
-# 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
@@ -1,26 +1,13 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 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
+# SPDX-License-Identifier: Apache-2.0
 #
-# 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}"
        ;;
@@ -40,21 +27,19 @@ 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" "$@"
@@ -554,16 +554,6 @@ 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

@@ -1,28 +0,0 @@
-# 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")
@@ -10,10 +10,8 @@
 /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/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/fsg	    /vendor/fsg		      ext4	ro,nosuid,nodev,context=u:object_r:fsg_firmware_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
@@ -43,7 +43,4 @@ on boot

 on post-fs-data
    mkdir /data/fpc 0700 system system
-    mkdir /data/.fps 0770 system fingerp
-
-on property:ro.boot.hardware.sku=XT1802
-    insmod /vendor/lib/modules/isdbt.ko
+    mkdir /data/.fps 0770 system oem_5015
@@ -1,27 +1,15 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 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.
+# SPDX-License-Identifier: Apache-2.0
 #

 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" "$@"
Author	SHA1	Message	Date
Jorge Lucas	68e23dbe31	sanders: Add the necessary dependencies for official builds Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>	2021-03-25 00:09:27 -03:00
Michael Bestas	f99a407d29	sanders: Switch to standalone extract utils * Align with templates while we are at it	2021-03-21 09:39:06 -03:00
Jorge Lucas	aafccfe758	sanders: Split device properties	2021-03-21 09:36:47 -03:00
LuK1337	96e2f8fece	sanders: Fix host_init_verifier errors Change-Id: Ieb693814ad69e6864c7baadf6922ab7cbdb6ac4c	2021-03-21 09:36:24 -03:00
Sujin Panicker	8a0589c61e	sanders: configs: Add BT SCO to routes list	2021-03-21 09:36:06 -03:00
Erfan Abdi	9c7db6d97e	sanders: Downver audio halVersion to 2.0	2021-03-21 09:36:06 -03:00
dianlujitao	332948fe24	sanders: Enable AOSP bluetooth audio HAL v2	2021-03-21 09:36:06 -03:00
Erfan Abdi	04ae15fa9d	sanders: audio: Add missing AFE Proxy paths Signed-off-by: Erfan Abdi <erfangplus@gmail.com>	2021-03-21 09:36:06 -03:00
Erfan Abdi	91b1559903	sanders: enable “fast input” policy for mic * fix for audio recording in camera Signed-off-by: Erfan Abdi <erfangplus@gmail.com>	2021-03-21 09:35:58 -03:00
Erfan Abdi	652541e656	sanders: symlink /vendor/firmware_mnt to /vendor/f * For oreo blobs to access firmwares from vendor Change-Id: I012f02ce967cdd5d3651b3ee175963e244bfea79 Signed-off-by: Erfan Abdi <erfangplus@gmail.com> Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>	2021-03-21 09:35:46 -03:00
Marc Bourgoin	3bf1178f51	sanders: add mkdir of /data/.fps to init.sanders.rc For some reason selinux doesn't want to give mkdir perms to our fingerprint HAL for that directory no matter what I set in file_contexts, so let's just mkdir in our init to fix this denial. Change-Id: Ief96ece317571cd8a7fae9afc16c69dde70160c1	2021-03-21 09:35:46 -03:00
Jorge Lucas	bc5bc41e4a	sanders: Load camera configs from vendor Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>	2021-03-21 09:35:33 -03:00
Erfan Abdi	d62af06282	sanders: Get rid of libandroid on camera blobs Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>	2021-03-21 09:31:05 -03:00
Erfan Abdi	2e62fd97ec	sanders: Use moto camera.device@1.0-impl.so Change-Id: I8a907de60f9ae4c903740282253b91fe8e5bc273 Signed-off-by: Erfan Abdi <erfangplus@gmail.com>	2021-03-21 09:29:34 -03:00
Erfan Abdi	735c6b3efa	sanders: Wrap libgui_vendor into libwui Change-Id: Ifa25ec6a2aaf3855c24b2a3a46b80abb8501b189 Signed-off-by: Erfan Abdi <erfangplus@gmail.com>	2021-03-21 09:29:34 -03:00
Erfan Abdi	1b2f463bd4	sanders: Dirty fix to keep camera hal on boot stage * This prevents from hal running setCameraLaunchStatus * service.bootanim.exit -> service.bootanim.hold Change-Id: Ia362d9f6c579d7863c815beae51b0147b4a1369d	2021-03-21 09:29:20 -03:00
Jorge Lucas	f72720d601	sanders: Initial device tree Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>	2021-03-21 09:25:26 -03:00