sdm660-common: Update common tree and adapt changes

* Adjust with wayne-common
* Switch to standalone extract utils from pa
* Update FCM level to 3
* Move IR Blaster to device specific repo

Co-authored-by: Erfan Abdi <erfangplus@gmail.com>
Co-authored-by: Michael Bestas <mkbestas@lineageos.org>
Signed-off-by: OdSazib <odsazib@gmail.com>

BoardConfigCommon.mk

@@ -160,6 +160,7 @@ KERNEL_LD := LD=ld.lld
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_HEADER_ARCH := arm64
 TARGET_KERNEL_VERSION := 4.4
+TARGET_KERNEL_SOURCE := kernel/xiaomi/sdm660
 
 # Enable stats logging in LMKD
 TARGET_LMKD_STATS_LOG := true

README.md

@@ -1,4 +1,4 @@
-This repository contains device configuration for Xiaomi SDM660 devices
+### This repository contains device configuration for Xiaomi-SDM660 devices
 
 Basic   | Spec Sheet
 -------:|:----------
@@ -10,16 +10,27 @@ ROM     | 32/64/128GB
 RAM     | 3/4/6GB
 Android | 8.1.0
 
-Note:
+## Notes:
-Depends on: android_packages_resources_devicesettings from LineageOS
+ - Depends on: android_packages_resources_devicesettings from LineageOS
+ - Depends on: LA.QSSI.11.0.r1-09100-qssi.0 tag for vendor_codeaurora_telephony
+ - Depends on: LA.UM.9.6.2.r1-03600-89xx.0 tag for GPS and WFD
+
+## Currently Supported Devices:
+ - clover (MI PAD 4 /4 Plus)
+ - jason (Redmi Note 3)
+ - jasmine_sprout (MI A2)
+ - lavender (Redmi Note 7)
+ - platina (Mi 8 Lite)
+ - tulip (Redmi Note 6 Pro)
+ - wayne (MI 6X)
+ - whyred (Redmi Note 5)
 
-Currently Supported Devices: wayne (MI 6X), jasmine_sprout (MI A2), clover (MI PAD 4 /4 Plus),
-lavender (Redmi Note 7) and platina (Mi 8 Lite)
 ## Copyright
 
 ```
 #
 # Copyright (C) 2018 The LineageOS Project
+# Copyright (C) 2018-2021 Xiaomi-SDM660 Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extract-files.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018 The LineageOS Project
+# Copyright (C) 2020 Paranoid Android
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ fi
 
 ROOT="$COMMON_DIR"/../../..
 
-HELPER="$ROOT"/vendor/awaken/build/tools/extract_utils.sh
+HELPER="$ROOT"/tools/extract-utils/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -121,8 +121,16 @@ function blob_fixup() {
         ;;
 
     esac
+
+    device_blob_fixup "$@"
 }
 
+if ! typeset -f device_blob_fixup > /dev/null; then
+    device_blob_fixup() {
+        :
+    }
+fi
+
 # Initialize the common helper
 setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ROOT" true $CLEAN_VENDOR
 

manifest.xml

@@ -25,7 +25,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<manifest version="1.0" type="device" target-level="2">
+<manifest version="1.0" type="device" target-level="3">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>

rootdir/etc/ueventd.qcom.rc

@@ -389,6 +389,3 @@ firmware_directories /vendor/firmware_mnt/image/
 /sys/class/graphics/fb0     modes                    0664    system  graphics
 /sys/class/graphics/fb0     mode                     0664    system  graphics
 /sys/class/graphics/fb0     msm_cmd_autorefresh_en   0664    system  graphics
-
-# IR
-/dev/spidev7.1                                       0664    system  system

setup-makefiles.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018 The LineageOS Project
+# Copyright (C) 2020 Paranoid Android
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +18,9 @@
 set -e
 
 DEVICE_COMMON=sdm660-common
-GUARDED_DEVICES_COMMON="tulip jasmine_sprout wayne clover lavender platina jason whyred"
+GUARDED_DEVICES_COMMON="clover jasmine_sprout jason lavender platina tulip wayne whyred"
 VENDOR=xiaomi
 
-INITIAL_COPYRIGHT_YEAR=2018
-
 # Load extract_utils and do some sanity checks
 COMMON_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$COMMON_DIR" ]]; then COMMON_DIR="$PWD"; fi
@@ -33,7 +31,7 @@ fi
 
 ROOT="$COMMON_DIR"/../../..
 
-HELPER="$ROOT"/vendor/awaken/build/tools/extract_utils.sh
+HELPER="$ROOT"/tools/extract-utils/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -59,7 +57,6 @@ if ([[ "$ONLY_COMMON" = "false" ]] || [[ -z "$ONLY_COMMON" ]]) && [[ -s "${DEVIC
         GUARDED_DEVICES=
     fi
     # Reinitialize the helper for device
-    INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR"
     setup_vendor "$DEVICE" "$VENDOR" "$ROOT" "$IS_COMMON" "$CLEAN_VENDOR"
     # Copyright headers and guards
     write_headers "$GUARDED_DEVICES"