sdm710-common: Add vendor

sdm710-common: Fix up dependencies
sdm710-common: Move to Xiaomi IR AIDL
2024-10-16 15:27:55 -04:00 · 2024-10-16 15:15:30 -04:00 · 2024-10-16 15:09:58 -04:00 · 2024-10-16 15:09:35 -04:00 · 2024-07-07 23:14:53 -04:00 · 2024-07-05 16:17:36 -04:00
31 changed files with 815 additions and 389 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -10,4 +10,25 @@ ifneq ($(filter grus pyxis xmsirius vela,$(TARGET_DEVICE)),)

 include $(call all-makefiles-under,$(LOCAL_PATH))

+include $(CLEAR_VARS)
+
+# A/B builds require us to create the mount points at compile time.
+# Just creating it for all cases since it does not hurt.
+FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt
+$(FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
+	@echo "Creating $(FIRMWARE_MOUNT_POINT)"
+	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
+
+BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware
+$(BT_FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
+	@echo "Creating $(BT_FIRMWARE_MOUNT_POINT)"
+	@mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware
+
+DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp
+$(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
+	@echo "Creating $(DSP_MOUNT_POINT)"
+	@mkdir -p $(TARGET_OUT_VENDOR)/dsp
+
+ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
+
 endif
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -41,8 +41,14 @@ USE_CUSTOM_AUDIO_POLICY := 1
 TARGET_BOOTLOADER_BOARD_NAME := sdm710
 TARGET_NO_BOOTLOADER := true

+# Camera
+TARGET_USES_YCRCB_CAMERA_ENCODE := true
+
 # Display
 TARGET_HAS_WIDE_COLOR_DISPLAY := true
+TARGET_USES_GRALLOC1 := true
+TARGET_USES_HWC2 := true
+TARGET_USES_ION := true
 ifeq ($(TARGET_HAS_UDFPS),true)
 TARGET_USES_FOD_ZPOS := true
 endif
@@ -50,6 +56,11 @@ endif
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs

+# Fingerprint
+ifeq ($(TARGET_HAS_UDFPS),true)
+TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/xiaomi:libudfps_extension.xiaomi
+endif
+
 # FM
 ifeq ($(TARGET_HAS_FM),true)
 BOARD_HAS_QCA_FM_SOC := "cherokee"
@@ -69,8 +80,8 @@ BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
 TARGET_KERNEL_SOURCE := kernel/xiaomi/sdm710
 TARGET_KERNEL_CONFIG := sdm670-perf_defconfig xiaomi/sdm710-common.config

-# Media
-TARGET_USES_ION := true
+# Lineage Health
+TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS := false

 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
@@ -91,8 +102,6 @@ $(foreach p, $(call to-upper, $(ALL_PARTITIONS)), \
    $(eval TARGET_COPY_OUT_$(p) := $(call to-lower, $(p))))

 # Partitions - dynamic
-AB_OTA_UPDATER := false
-
 BOARD_SUPER_PARTITION_SIZE := 6442450944
 BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
 BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := $(ALL_PARTITIONS)
@@ -133,7 +142,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)
 ENABLE_VENDOR_RIL_SERVICE := true

 # Security patch level
-VENDOR_SECURITY_PATCH := 2022-05-01
+VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)

 # Sepolicy
 TARGET_USES_LOGDUMP_AS_METADATA := true
@@ -157,12 +166,15 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
    $(COMMON_PATH)/framework_compatibility_matrix.xml \
    hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
    hardware/qcom-caf/common/vendor_framework_compatibility_matrix_legacy.xml \
-    hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml
+    hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml \
+    vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
 ifeq ($(TARGET_HAS_FM),true)
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_fm.xml
 endif
+ifeq ($(TARGET_HAS_NFC),true)
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_nfc.xml
+endif
 DEVICE_MATRIX_FILE += hardware/qcom-caf/common/compatibility_matrix.xml

 # VNDK
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -0,0 +1,14 @@
+[
+  {
+    "repository": "hardware_xiaomi",
+    "target_path": "hardware/xiaomi"
+  },
+  {
+    "repository": "kernel_xiaomi_sdm710",
+    "target_path": "kernel/xiaomi/sdm710"
+  }
+  {
+    "repository": "vendor_xiaomi_sdm710",
+    "target_path": "vendor/xiaomi/sdm710"
+  }
+]
--- a/extract-files.py
+++ b/extract-files.py
@@ -1,97 +0,0 @@
-#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-from extract_utils.fixups_blob import (
-    blob_fixup,
-    blob_fixups_user_type,
-)
-from extract_utils.fixups_lib import (
-    lib_fixup_remove,
-    lib_fixups,
-    lib_fixups_user_type,
-)
-from extract_utils.main import (
-    ExtractUtils,
-    ExtractUtilsModule,
-)
-
-namespace_imports = [
-    'device/xiaomi/sdm710-common',
-    'hardware/qcom-caf/sdm845',
-    'hardware/qcom-caf/wlan',
-    'hardware/xiaomi',
-    'vendor/qcom/opensource/commonsys/display',
-    'vendor/qcom/opensource/commonsys-intf/display',
-    'vendor/qcom/opensource/dataservices',
-    'vendor/qcom/opensource/display',
-]
-
-def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
-    return f'{lib}_{partition}' if partition == 'vendor' else None
-
-
-lib_fixups: lib_fixups_user_type = {
-    **lib_fixups,
-    (
-        'com.qualcomm.qti.dpm.api@1.0',
-        'com.qualcomm.qti.imscmservice@1.0',
-        'com.qualcomm.qti.imscmservice@2.0',
-        'com.qualcomm.qti.imscmservice@2.1',
-        'com.qualcomm.qti.imscmservice@2.2',
-        'com.qualcomm.qti.uceservice@2.0',
-        'com.qualcomm.qti.uceservice@2.1',
-        'com.qualcomm.qti.uceservice@2.2',
-        'libmmosal',
-        'vendor.qti.hardware.alarm@1.0',
-        'vendor.qti.hardware.fm@1.0',
-        'vendor.qti.hardware.radio.am@1.0',
-        'vendor.qti.hardware.radio.ims@1.0',
-        'vendor.qti.hardware.radio.ims@1.1',
-        'vendor.qti.hardware.radio.ims@1.2',
-        'vendor.qti.hardware.radio.ims@1.3',
-        'vendor.qti.hardware.radio.ims@1.4',
-        'vendor.qti.hardware.wifidisplaysession@1.0',
-        'vendor.qti.ims.callinfo@1.0',
-        'vendor.qti.ims.rcsconfig@1.0',
-        'vendor.qti.imsrtpservice@3.0',
-    ): lib_fixup_vendor_suffix,
-    (
-        'libwpa_client',
-    ): lib_fixup_remove,
-}
-
-blob_fixups: blob_fixups_user_type = {
-    'system_ext/lib/libwfdservice.so': blob_fixup()
-        .replace_needed('android.media.audio.common.types-V2-cpp.so','android.media.audio.common.types-V4-cpp.so'),
-    'system_ext/lib64/lib-imsvideocodec.so': blob_fixup()
-        .add_needed('libgui_shim.so'),
-    'vendor/bin/pm-service': blob_fixup()
-        .add_needed('libutils-v33.so'),
-    'vendor/etc/seccomp_policy/atfwd@2.0.policy': blob_fixup()
-        .add_line_if_missing('gettid: 1'),
-    'vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy': blob_fixup()
-        .add_line_if_missing('madvise: 1'),
-    'vendor/lib64/libwvhidl.so': blob_fixup()
-        .add_needed('libcrypto_shim.so'),
-    'vendor/lib64/mediadrm/libwvdrmengine.so': blob_fixup()
-        .add_needed('libcrypto_shim.so'),
-    (
-        'vendor/etc/data/dsi_config.xml',
-        'vendor/etc/data/netmgr_config.xml',
-    ): blob_fixup().fix_xml(),
-}  # fmt: skip
-
-module = ExtractUtilsModule(
-    'sdm710-common',
-    'xiaomi',
-    blob_fixups=blob_fixups,
-    lib_fixups=lib_fixups,
-    namespace_imports=namespace_imports,
-)
-
-if __name__ == '__main__':
-    utils = ExtractUtils.device(module)
-    utils.run()
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../.."
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+function blob_fixup() {
+    case "${1}" in
+        system_ext/lib64/lib-imsvideocodec.so)
+            "${PATCHELF}" --add-needed "libgui_shim.so" "${2}"
+            ;;
+        vendor/bin/pm-service)
+            grep -q libutils-v33.so "${2}" || "${PATCHELF}" --add-needed "libutils-v33.so" "${2}"
+            ;;
+        vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy)
+            echo 'madvise: 1' >> ${2}
+            ;;
+    esac
+}
+
+# Default to sanitizing the vendor folder before extraction
+CLEAN_VENDOR=true
+
+ONLY_COMMON=
+ONLY_TARGET=
+KANG=
+SECTION=
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        --only-common )
+                ONLY_COMMON=true
+                ;;
+        --only-target )
+                ONLY_TARGET=true
+                ;;
+        -n | --no-cleanup )
+                CLEAN_VENDOR=false
+                ;;
+        -k | --kang )
+                KANG="--kang"
+                ;;
+        -s | --section )
+                SECTION="${2}"; shift
+                CLEAN_VENDOR=false
+                ;;
+        * )
+                SRC="${1}"
+                ;;
+    esac
+    shift
+done
+
+if [ -z "${SRC}" ]; then
+    SRC="adb"
+fi
+
+if [ -z "${ONLY_TARGET}" ]; then
+    # Initialize the helper for common device
+    setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
+
+    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    extract "${MY_DIR}/proprietary-files-nfc.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+fi
+
+if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
+    # Reinitialize the helper for device
+    source "${MY_DIR}/../${DEVICE}/extract-files.sh"
+    setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
+
+    extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+fi
+
+"${MY_DIR}/setup-makefiles.sh"
--- a/manifest.xml
+++ b/manifest.xml
@@ -92,7 +92,7 @@
    <hal format="hidl">
        <name>android.hardware.tetheroffload.control</name>
        <transport>hwbinder</transport>
-        <fqname>@1.1::IOffloadControl/default</fqname>
+        <fqname>@1.0::IOffloadControl/default</fqname>
    </hal>
    <hal format="hidl">
        <name>com.qualcomm.qti.imscmservice</name>
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -89,9 +89,12 @@ Only the three quirks included above are recognized at this point:
 |_____________|_________________________________________|
 | h264        | 4096    2160    24      100      829440 |
 | hevc        | 4096    2160    24      100      829440 |
+ | mpeg4-sw    | 1920    1088    30      40       244800 |
 | vp8         | 3840    2160    30      100      972000 |
 | vp9         | 4096    2160    24      100      829440 |
 | vc1         | 1920    1088    30      20       244800 |
+ | div4/5/6-sw | 1920    1088    30      10       244800 |
+ | h263-sw     | 864     480     30      16        48600 |
 | mpeg2       | 1920    1088    30      40       244800 |
 |_____________|_________________________________________|

@@ -111,7 +114,9 @@ Only the three quirks included above are recognized at this point:
 |__________|_________________________________________|
 | h264     | 4096    2160    24      100     829440  |
 | hevc     | 4096    2160    24      100     829440  |
+ | mpeg4-sw | 1280     720    30      4       108000  |
 | vp8      | 3840    2160    30      100     972000  |
+ | h263-sw  | 864     480     30      2       48600   |
 |__________|_________________________________________|
 -->

@@ -121,6 +126,7 @@ Only the three quirks included above are recognized at this point:
        <Setting name="max-video-encoder-input-buffers" value="11" />
    </Settings>
    <Encoders>
+        <!-- Video Hardware  -->
        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
            <Quirk name="requires-allocate-on-input-ports" />
            <Quirk name="requires-allocate-on-output-ports" />
@@ -169,8 +175,36 @@ Only the three quirks included above are recognized at this point:
            <Limit name="performance-point-1920x1080" value="120" />
            <Limit name="performance-point-1280x720" value="240" />
        </MediaCodec>
+        <!-- Video Software -->
+        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="32x32" max="864x480" />
+            <Limit name="alignment" value="4x4" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="48600" />
+            <Limit name="bitrate" range="1-2000000" />
+            <Limit name="frame-rate" range="1-30" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-720x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+             <Quirk name="requires-loaded-to-idle-after-allocation" />
+             <Limit name="size" min="32x32" max="1280x720" />
+             <Limit name="alignment" value="2x2" />
+             <Limit name="block-size" value="16x16" />
+             <Limit name="blocks-per-second" min="1" max="108000" />
+             <Limit name="bitrate" range="1-4000000" />
+             <Limit name="frame-rate" range="1-30" />
+             <Limit name="concurrent-instances" max="16" />
+             <Limit name="performance-point-1280x720" value="30" />
+        </MediaCodec>
    </Encoders>
    <Decoders>
+       <!-- Video Hardware  -->
        <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
            <Quirk name="requires-allocate-on-input-ports" />
            <Quirk name="requires-allocate-on-output-ports" />
@@ -311,5 +345,31 @@ Only the three quirks included above are recognized at this point:
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="60" />
        </MediaCodec>
+        <!-- Video Software -->
+        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+             <Limit name="size" min="16x16" max="864x480" />
+             <Limit name="alignment" value="4x4" />
+             <Limit name="block-size" value="16x16" />
+             <Limit name="blocks-per-second" min="1" max="48600" />
+             <Limit name="bitrate" range="1-16000000" />
+             <Limit name="frame-rate" range="1-30" />
+             <Feature name="adaptive-playback" />
+             <Limit name="concurrent-instances" max="16" />
+             <Limit name="performance-point-720x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+                <Limit name="size" min="16x16" max="1920x1088" />
+                <Limit name="alignment" value="2x2" />
+                <Limit name="block-size" value="16x16" />
+                <Limit name="blocks-per-second" min="1" max="244800" />
+                <Limit name="bitrate" range="1-40000000" />
+                <Limit name="frame-rate" range="1-30" />
+                <Limit name="concurrent-instances" max="16" />
+                <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
    </Decoders>
 </MediaCodecs>
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -34,6 +34,16 @@ limitations under the License.
            <Limit name="measured-frame-rate-1920x1080" range="16-45" />
            <Limit name="measured-frame-rate-3840x2160" range="31-31" />
        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="200-200" />
+            <Limit name="measured-frame-rate-352x288" range="144-144" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="200-200" />
+            <Limit name="measured-frame-rate-352x288" range="144-144" />
+            <Limit name="measured-frame-rate-640x480" range="50-50" />
+            <Limit name="measured-frame-rate-1280x720" range="30-30" />
+        </MediaCodec>
        <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
            <Limit name="measured-frame-rate-320x180" range="266-266" />
            <Limit name="measured-frame-rate-640x360" range="165-165" />
@@ -78,6 +88,17 @@ limitations under the License.
            <Limit name="measured-frame-rate-1920x1080" range="170-190" />
            <Limit name="measured-frame-rate-3840x2160" range="45-50" />
        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="200-400" />
+            <Limit name="measured-frame-rate-352x288" range="400-490" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" update="true">
+           <Limit name="measured-frame-rate-176x144" range="625-688" />
+           <Limit name="measured-frame-rate-352x288" range="144-144" />
+           <Limit name="measured-frame-rate-480x360" range="346-423" />
+           <Limit name="measured-frame-rate-640x480" range="50-50" />
+           <Limit name="measured-frame-rate-1280x720" range="50-110" />
+        </MediaCodec>
        <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
            <Limit name="measured-frame-rate-320x180" range="545-545" />
            <Limit name="measured-frame-rate-320x240" range="337-337" />
--- a/media/media_codecs_performance_v1.xml
+++ b/media/media_codecs_performance_v1.xml
@@ -38,11 +38,21 @@ limitations under the License.
            <Limit name="measured-frame-rate-176x144" range="303-303" />
            <Limit name="measured-frame-rate-352x288" range="259-259" />
        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="200-200" />
+            <Limit name="measured-frame-rate-352x288" range="144-144" />
+        </MediaCodec>
        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
            <Limit name="measured-frame-rate-176x144" range="299-299" />
            <Limit name="measured-frame-rate-352x288" range="245-245" />
            <Limit name="measured-frame-rate-640x480" range="148-148" />
        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="200-200" />
+            <Limit name="measured-frame-rate-352x288" range="144-144" />
+            <Limit name="measured-frame-rate-640x480" range="50-50" />
+            <Limit name="measured-frame-rate-1280x720" range="30-30" />
+        </MediaCodec>
        <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
            <Limit name="measured-frame-rate-320x180" range="266-266" />
            <Limit name="measured-frame-rate-640x360" range="165-165" />
@@ -90,10 +100,21 @@ limitations under the License.
            <Limit name="measured-frame-rate-176x144" range="356-356" />
            <Limit name="measured-frame-rate-352x288" range="292-292" />
        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="200-400" />
+            <Limit name="measured-frame-rate-352x288" range="400-490" />
+        </MediaCodec>
        <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
            <Limit name="measured-frame-rate-176x144" range="146-146" />
            <Limit name="measured-frame-rate-480x360" range="145-145" />
        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" update="true">
+           <Limit name="measured-frame-rate-176x144" range="625-688" />
+           <Limit name="measured-frame-rate-352x288" range="144-144" />
+           <Limit name="measured-frame-rate-480x360" range="346-423" />
+           <Limit name="measured-frame-rate-640x480" range="50-50" />
+           <Limit name="measured-frame-rate-1280x720" range="74-84" />
+        </MediaCodec>
        <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
            <Limit name="measured-frame-rate-320x240" range="337-337" />
            <Limit name="measured-frame-rate-640x360" range="337-337" />
--- a/media/media_codecs_vendor.xml
+++ b/media/media_codecs_vendor.xml
@@ -89,8 +89,12 @@ Only the three quirks included above are recognized at this point:
 |_____________|_________________________________________|
 | h264        | 4096    2160    24      100      829440 |
 | hevc        | 4096    2160    24      100      829440 |
+ | mpeg4-sw    | 1920    1088    30      40       244800 |
 | vp8         | 3840    2160    30      100      972000 |
 | vp9         | 4096    2160    24      100      829440 |
+ | vc1         | 1920    1088    30      20       244800 |
+ | div4/5/6-sw | 1920    1088    30      10       244800 |
+ | h263-sw     | 864     480     30      16        48600 |
 | mpeg2       | 1920    1088    30      40       244800 |
 |_____________|_________________________________________|

@@ -110,7 +114,9 @@ Only the three quirks included above are recognized at this point:
 |__________|_________________________________________|
 | h264     | 4096    2160    24      100     829440  |
 | hevc     | 4096    2160    24      100     829440  |
+ | mpeg4-sw | 1280     720    30      4       108000  |
 | vp8      | 3840    2160    30      100     972000  |
+ | h263-sw  | 864     480     30      2       48600   |
 |__________|_________________________________________|
 -->

@@ -120,6 +126,7 @@ Only the three quirks included above are recognized at this point:
        <Setting name="max-video-encoder-input-buffers" value="11" />
    </Settings>
    <Encoders>
+        <!-- Video Hardware  -->
        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
            <Quirk name="requires-allocate-on-input-ports" />
            <Quirk name="requires-allocate-on-output-ports" />
@@ -168,8 +175,36 @@ Only the three quirks included above are recognized at this point:
            <Limit name="performance-point-1920x1080" value="120" />
            <Limit name="performance-point-1280x720" value="240" />
        </MediaCodec>
+        <!-- Video Software -->
+        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="32x32" max="864x480" />
+            <Limit name="alignment" value="4x4" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="48600" />
+            <Limit name="bitrate" range="1-2000000" />
+            <Limit name="frame-rate" range="1-30" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-720x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+             <Quirk name="requires-loaded-to-idle-after-allocation" />
+             <Limit name="size" min="32x32" max="1280x720" />
+             <Limit name="alignment" value="2x2" />
+             <Limit name="block-size" value="16x16" />
+             <Limit name="blocks-per-second" min="1" max="108000" />
+             <Limit name="bitrate" range="1-4000000" />
+             <Limit name="frame-rate" range="1-30" />
+             <Limit name="concurrent-instances" max="16" />
+             <Limit name="performance-point-1280x720" value="30" />
+        </MediaCodec>
    </Encoders>
    <Decoders>
+       <!-- Video Hardware  -->
        <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
            <Quirk name="requires-allocate-on-input-ports" />
            <Quirk name="requires-allocate-on-output-ports" />
@@ -310,5 +345,44 @@ Only the three quirks included above are recognized at this point:
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="60" />
        </MediaCodec>
+        <!-- Video Software -->
+        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+             <Limit name="size" min="16x16" max="864x480" />
+             <Limit name="alignment" value="4x4" />
+             <Limit name="block-size" value="16x16" />
+             <Limit name="blocks-per-second" min="1" max="48600" />
+             <Limit name="bitrate" range="1-16000000" />
+             <Limit name="frame-rate" range="1-30" />
+             <Feature name="adaptive-playback" />
+             <Limit name="concurrent-instances" max="16" />
+             <Limit name="performance-point-720x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+                <Limit name="size" min="16x16" max="1920x1088" />
+                <Limit name="alignment" value="2x2" />
+                <Limit name="block-size" value="16x16" />
+                <Limit name="blocks-per-second" min="1" max="244800" />
+                <Limit name="bitrate" range="1-40000000" />
+                <Limit name="frame-rate" range="1-30" />
+                <Limit name="concurrent-instances" max="16" />
+                <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.vc1sw" type="video/x-ms-wmv" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="frame-rate" range="1-30" />
+            <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
    </Decoders>
 </MediaCodecs>
--- a/media/media_codecs_vendor_v1.xml
+++ b/media/media_codecs_vendor_v1.xml
@@ -91,10 +91,14 @@ Only the three quirks included above are recognized at this point:
 |             | (4096)  (2304)  (30)    (120)           |
 | hevc        | 4096    2160    60      120     2073600 |
 |             | (4096)  (2304)  (30)    (120)           |
+ | mpeg4-sw    | 1920    1088    30      40      244800  |
 | vp8         | 4096    2160    30      120     1036800 |
 |             | (4096)  (2304)  (24)    (120)           |
 | vp9         | 4096    2160    60      120     2073600 |
 |             | (4096)  (2304)  (30)    (120)           |
+ | vc1         | 1920    1088    30      20      244800  |
+ | div4/5/6-sw | 1920    1088    30      10      244800  |
+ | h263-sw     | 864     480     30      16       48600   |
 | mpeg2       | 1920    1088    30      40      244800  |
 |_____________|_________________________________________|

@@ -119,8 +123,10 @@ Only the three quirks included above are recognized at this point:
 |          | (4096)  (2304)  (30)    (120)           |
 | hevc     | 4096    2160    60      120     2073600 |
 |          | (4096)  (2304)  (30)    (120)           |
+ | mpeg4-sw | 1280     720    30      4       108000  |
 | vp8      | 4096    2160    30      120     1036800 |
 |          | (4096)  (2304)  (24)    (120)           |
+ | h263-sw  | 864     480     30      2       48600   |
 |__________|_________________________________________|
 -->

@@ -130,6 +136,7 @@ Only the three quirks included above are recognized at this point:
        <Setting name="max-video-encoder-input-buffers" value="11" />
    </Settings>
    <Encoders>
+        <!-- Video Hardware  -->
        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
            <Quirk name="requires-allocate-on-input-ports" />
            <Quirk name="requires-allocate-on-output-ports" />
@@ -178,8 +185,36 @@ Only the three quirks included above are recognized at this point:
            <Limit name="performance-point-1920x1080" value="240" />
            <Limit name="performance-point-1280x720" value="480" />
        </MediaCodec>
+        <!-- Video Software -->
+        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="32x32" max="864x480" />
+            <Limit name="alignment" value="4x4" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="48600" />
+            <Limit name="bitrate" range="1-2000000" />
+            <Limit name="frame-rate" range="1-30" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-720x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+             <Quirk name="requires-loaded-to-idle-after-allocation" />
+             <Limit name="size" min="32x32" max="1280x720" />
+             <Limit name="alignment" value="2x2" />
+             <Limit name="block-size" value="16x16" />
+             <Limit name="blocks-per-second" min="1" max="108000" />
+             <Limit name="bitrate" range="1-4000000" />
+             <Limit name="frame-rate" range="1-30" />
+             <Limit name="concurrent-instances" max="16" />
+             <Limit name="performance-point-1280x720" value="30" />
+        </MediaCodec>
    </Encoders>
    <Decoders>
+       <!-- Video Hardware  -->
        <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
            <Quirk name="requires-allocate-on-input-ports" />
            <Quirk name="requires-allocate-on-output-ports" />
@@ -316,5 +351,45 @@ Only the three quirks included above are recognized at this point:
            <Limit name="performance-point-4096x2304" value="56" />
            <Limit name="performance-point-3840x2160" value="60" />
        </MediaCodec>
+        <!-- Video Software -->
+        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+             <Limit name="size" min="16x16" max="864x480" />
+             <Limit name="alignment" value="4x4" />
+             <Limit name="block-size" value="16x16" />
+             <Limit name="blocks-per-second" min="1" max="48600" />
+             <Limit name="bitrate" range="1-16000000" />
+             <Limit name="frame-rate" range="1-30" />
+             <Feature name="adaptive-playback" />
+             <Limit name="concurrent-instances" max="16" />
+             <Limit name="performance-point-720x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
+             <Quirk name="requires-allocate-on-input-ports" />
+             <Quirk name="requires-allocate-on-output-ports" />
+                <Limit name="size" min="16x16" max="1920x1088" />
+                <Limit name="alignment" value="2x2" />
+                <Limit name="block-size" value="16x16" />
+                <Limit name="blocks-per-second" min="1" max="244800" />
+                <Limit name="bitrate" range="1-40000000" />
+                <Limit name="frame-rate" range="1-30" />
+                <Limit name="concurrent-instances" max="16" />
+                <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qti.video.decoder.vc1sw" type="video/x-ms-wmv" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+            <Limit name="frame-rate" range="1-30" />
+            <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <!-- Audio Software  -->
    </Decoders>
 </MediaCodecs>
--- a/overlay-evolution/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay-evolution/lineage-sdk/lineage/res/res/values/config.xml
--- a/overlay-evolution/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ b/overlay-evolution/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
--- a/overlay-lineage/packages/apps/Settings/res/values/evolution_config.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values/evolution_config.xml
--- a/overlay/packages/services/DeviceAsWebcam/interface/res/raw/ignored_v4l2_nodes.json
+++ b/overlay/packages/services/DeviceAsWebcam/interface/res/raw/ignored_v4l2_nodes.json
--- a/proprietary-files-nfc.txt
+++ b/proprietary-files-nfc.txt
@@ -0,0 +1,13 @@
+# Unpinned blobs from pyxis-user 11 RKQ1.200826.002 V12.5.3.0.RFCEUXM release-keys
+# grus: grus-user 11 RKQ1.200826.002 V12.5.1.0.RFBMIXM release-keys
+
+# Secure element - from grus
+vendor/bin/hw/vendor.qti.secure_element@1.0-service|48621dda1de283dcf0f5c93f0d17bcd53f3f2072
+vendor/etc/init/vendor.qti.secure_element@1.0-service.rc|14796c45011ad0d4735e0f3c9dbc646e6af205aa
+vendor/lib64/hw/android.hardware.secure_element@1.0-impl.so|99bb218cf8491ac7e031dc389267454b4acbcfe6
+
+# Secure element (power manager)
+vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
+vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
+vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so
+vendor/lib64/vendor.qti.esepowermanager@1.0.so
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,13 +1,6 @@
 # Unpinned blobs from pyxis-user 11 RKQ1.200826.002 V12.5.3.0.RFCEUXM release-keys
 # grus: grus-user 11 RKQ1.200826.002 V12.5.1.0.RFBMIXM release-keys

-# GNU makefile dependants:
-# - libwpa_client:
-#   - imsdatadaemon
-#   - lowi-server
-#   - libcne
-#   - libwqe
-
 # ADSP
 vendor/bin/adsprpcd
 vendor/etc/init/vendor.qti.adsprpc-sscrpc-service.rc
@@ -41,16 +34,19 @@ vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
 vendor/lib64/libbtnv.so

 # Bluetooth (A2DP)
-vendor/lib/btaudio_offload_if.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
+vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so
+vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
+vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
+vendor/lib/btaudio_offload_if.so
 vendor/lib/libbluetooth_audio_session_qti.so
-vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so
-vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
+vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so
+vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so

 # CACert
-vendor/app/CACertService/CACertService.apk
+-vendor/app/CACertService/CACertService.apk
 vendor/lib64/libcacertclient.so
 vendor/lib64/libjnihelper.so
 vendor/lib64/vendor.qti.hardware.cacert@1.0.so
@@ -80,10 +76,8 @@ vendor/lib64/libsysmon_cdsp_skel.so
 vendor/bin/hvdcp_opti

 # CNE
-vendor/app/CneApp/CneApp.apk
+-vendor/app/CneApp/CneApp.apk
 vendor/bin/cnd
-vendor/etc/cne/profileSlm.xml
-vendor/etc/cne/slm.conf
 vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml
 vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml
 vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml
@@ -111,13 +105,15 @@ vendor/etc/cne/wqeclient/VZW/VZW_profile3.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile4.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile5.xml
 vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml
+vendor/etc/cne/profileSlm.xml
+vendor/etc/cne/slm.conf
 vendor/etc/init/cnd.rc
-vendor/lib64/libcne.so;DISABLE_CHECKELF
+vendor/lib64/libcne.so
 vendor/lib64/libcneapiclient.so
 vendor/lib64/libcneoplookup.so
 vendor/lib64/libcneqmiutils.so
 vendor/lib64/libwms.so
-vendor/lib64/libwqe.so;DISABLE_CHECKELF
+vendor/lib64/libwqe.so
 vendor/lib64/libxml.so
 vendor/lib64/vendor.qti.data.factory@2.0.so
 vendor/lib64/vendor.qti.data.factory@2.1.so
@@ -169,7 +165,7 @@ vendor/lib64/vendor.display.color@1.5.so
 vendor/lib64/vendor.display.postproc@1.0.so

 # DPM
-system/framework/tcmclient.jar
+framework/tcmclient.jar
 system_ext/bin/dpmd
 system_ext/etc/dpm/dpm.conf
 system_ext/etc/init/dpmd.rc
@@ -182,10 +178,10 @@ system_ext/lib64/libdpmctmgr.so
 system_ext/lib64/libdpmfdmgr.so
 system_ext/lib64/libdpmframework.so
 system_ext/lib64/libdpmtcm.so
-system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
+-system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
 vendor/bin/dpmQmiMgr
 vendor/etc/init/dpmQmiMgr.rc
-vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
 vendor/lib64/libdpmqmihal.so

 # DRM (QSEECom)
@@ -199,7 +195,6 @@ vendor/lib/libQSEEComAPI.so
 vendor/lib/libSecureUILib.so
 vendor/lib/libStDrvInt.so
 vendor/lib/libcppf.so
-vendor/lib/libdiag.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
 vendor/lib/libops.so
@@ -229,17 +224,17 @@ vendor/lib64/libtzdrmgenprov.so
 vendor/lib64/vendor.qti.hardware.qseecom@1.0.so

 # DRM (OEM Crypto API)
+vendor/lib64/libcpion.so
 vendor/lib64/libminkdescriptor.so
 vendor/lib64/liboemcrypto.so
-vendor/lib64/libqcbor.so
 vendor/lib64/libtrustedapploader.so

 # DRM (Widevine)
 vendor/bin/hw/android.hardware.drm@1.3-service.widevine
 vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
-vendor/lib64/libwvhidl.so
+-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
 vendor/lib64/mediadrm/libwvdrmengine.so
+vendor/lib64/libwvhidl.so

 # DSP service
 vendor/bin/dspservice
@@ -253,7 +248,7 @@ system_ext/lib64/fm_helium.so
 system_ext/lib64/libfm-hci.so
 system_ext/lib64/vendor.qti.hardware.fm@1.0.so
 vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
-vendor/lib64/vendor.qti.hardware.fm@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.fm@1.0.so

 # Graphics (Adreno)
 vendor/lib/egl/eglSubDriverAndroid.so
@@ -307,15 +302,15 @@ vendor/lib64/hw/vulkan.adreno.so
 # GNSS
 vendor/bin/hw/android.hardware.gnss@2.1-service-qti
 vendor/bin/loc_launcher
-vendor/bin/lowi-server;DISABLE_CHECKELF
+vendor/bin/lowi-server
 vendor/bin/slim_daemon
 vendor/bin/xtra-daemon
 vendor/bin/xtwifi-client
 vendor/bin/xtwifi-inet-agent
-vendor/etc/cacert_location.pem
 vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc
-vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
-vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
+-vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
+-vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
+vendor/etc/cacert_location.pem
 vendor/etc/xtra_root_cert.pem
 vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
 vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
@@ -386,9 +381,9 @@ system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so
 system_ext/lib64/vendor.qti.ims.callinfo@1.0.so
 system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so
 system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
-system_ext/priv-app/ims/ims.apk
+-system_ext/priv-app/ims/ims.apk
 vendor/bin/ims_rtp_daemon
-vendor/bin/imsdatadaemon;DISABLE_CHECKELF
+vendor/bin/imsdatadaemon
 vendor/bin/imsqmidaemon
 vendor/bin/imsrcsd
 vendor/etc/init/ims_rtp_daemon.rc
@@ -396,13 +391,13 @@ vendor/etc/init/imsdatadaemon.rc
 vendor/etc/init/imsqmidaemon.rc
 vendor/etc/init/imsrcsd.rc
 vendor/etc/seccomp_policy/imsrtp.policy
-vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.qualcomm.qti.uceservice@2.0.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.qualcomm.qti.uceservice@2.1.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.qualcomm.qti.uceservice@2.2.so;MODULE_SUFFIX=_vendor
+vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so
+vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so
+vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so
+vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so
+vendor/lib64/com.qualcomm.qti.uceservice@2.0.so
+vendor/lib64/com.qualcomm.qti.uceservice@2.1.so
+vendor/lib64/com.qualcomm.qti.uceservice@2.2.so
 vendor/lib64/lib-imscmservice.so
 vendor/lib64/lib-imsdpl.so
 vendor/lib64/lib-imsqimf.so
@@ -417,22 +412,22 @@ vendor/lib64/lib-rtpsl.so
 vendor/lib64/lib-siputility.so
 vendor/lib64/lib-uceservice.so
 vendor/lib64/librcc.so
-vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so;MODULE_SUFFIX=_vendor
-vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so;MODULE_SUFFIX=_vendor
-vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so;MODULE_SUFFIX=_vendor
-vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so;MODULE_SUFFIX=_vendor
-vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so
+vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so
+vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so
+vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so
+vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so
 vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so
 vendor/lib64/vendor.qti.ims.callcapability@1.0.so
-vendor/lib64/vendor.qti.ims.callinfo@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.ims.callinfo@1.0.so
 vendor/lib64/vendor.qti.ims.factory@1.0.so
-vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so
 vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so
 vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so
 vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so
 vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
-vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.imsrtpservice@3.0.so

 # IPA firmware
 vendor/etc/init/ipa_fws.rc
@@ -448,14 +443,6 @@ vendor/firmware/ipa_fws.mdt
 vendor/bin/msm_irqbalance
 vendor/etc/msm_irqbalance.conf

-# Keymaster
-vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
-vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
-vendor/lib64/libkeymasterdeviceutils.so
-vendor/lib64/libkeymasterprovision.so
-vendor/lib64/libkeymasterutils.so
-vendor/lib64/libqtikeymaster4.so
-
 # Listen
 vendor/lib/hw/sound_trigger.primary.sdm710.so
 vendor/lib/libadpcmdec.so
@@ -471,8 +458,8 @@ vendor/lib/librice.so
 vendor/lib/libsmwrapper.so

 # Media
-vendor/lib/libmmosal.so;MODULE_SUFFIX=_vendor
-vendor/lib64/libmmosal.so;MODULE_SUFFIX=_vendor
+vendor/lib/libmmosal.so
+vendor/lib64/libmmosal.so

 # Media configs
 odm/etc/media_profiles_V1_0.xml
@@ -487,22 +474,23 @@ vendor/lib64/libminksocket.so
 # Mlipay
 vendor/bin/mlipayd@1.1
 vendor/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc
-vendor/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mlipay.xml
+-vendor/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mlipay.xml
 vendor/lib64/libmlipay.so
 vendor/lib64/libmlipay@1.1.so

 # MTD
 vendor/bin/mtd@1.2
 vendor/etc/init/vendor.xiaomi.hardware.mtdservice@1.2-service.rc
-vendor/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mtdservice.xml
+-vendor/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mtdservice.xml
 vendor/lib64/libmfido.so
 vendor/lib64/libmt@1.2.so
 vendor/lib64/libwvkeybox.so
+vendor/lib64/vendor.xiaomi.hardware.mfidoca@1.0.so

 # Neural networks
 vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
 vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
-vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
+-vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
 vendor/lib64/libhexagon_nn_stub.so
 vendor/lib64/unnhal-acc-adreno.so
 vendor/lib64/unnhal-acc-common.so
@@ -511,6 +499,49 @@ vendor/lib64/unnhal-acc-hvx.so
 # NFC
 vendor/lib/libpn553_fw.so:vendor/lib64/libpn553_fw.so

+# OMX
+vendor/lib/libAlacSwDec.so
+vendor/lib/libApeSwDec.so
+vendor/lib/libFlacSwDec.so
+vendor/lib/libMpeg4SwEncoder.so
+vendor/lib/libOmxAacDec.so
+vendor/lib/libOmxAlacDec.so
+vendor/lib/libOmxAlacDecSw.so
+vendor/lib/libOmxAmrDec.so
+vendor/lib/libOmxAmrwbplusDec.so
+vendor/lib/libOmxApeDec.so
+vendor/lib/libOmxApeDecSw.so
+vendor/lib/libOmxDsdDec.so
+vendor/lib/libOmxEvrcDec.so
+vendor/lib/libOmxG711Dec.so
+vendor/lib/libOmxQcelp13Dec.so
+vendor/lib/libOmxSwVdec.so
+vendor/lib/libOmxSwVencMpeg4.so
+vendor/lib/libOmxVideoDSMode.so
+vendor/lib/libOmxVpp.so
+vendor/lib/libOmxWmaDec.so
+vendor/lib/libdsd2pcm.so
+vendor/lib/libswvdec.so
+vendor/lib64/libAlacSwDec.so
+vendor/lib64/libApeSwDec.so
+vendor/lib64/libFlacSwDec.so
+vendor/lib64/libMpeg4SwEncoder.so
+vendor/lib64/libOmxAacDec.so
+vendor/lib64/libOmxAlacDec.so
+vendor/lib64/libOmxAlacDecSw.so
+vendor/lib64/libOmxAmrDec.so
+vendor/lib64/libOmxAmrwbplusDec.so
+vendor/lib64/libOmxApeDec.so
+vendor/lib64/libOmxApeDecSw.so
+vendor/lib64/libOmxEvrcDec.so
+vendor/lib64/libOmxG711Dec.so
+vendor/lib64/libOmxQcelp13Dec.so
+vendor/lib64/libOmxSwVdec.so
+vendor/lib64/libOmxSwVencMpeg4.so
+vendor/lib64/libOmxVpp.so
+vendor/lib64/libOmxWmaDec.so
+vendor/lib64/libswvdec.so
+
 # Peripheral manager
 vendor/bin/pm-proxy
 vendor/bin/pm-service
@@ -518,14 +549,14 @@ vendor/lib64/libperipheral_client.so
 vendor/lib64/libspcom.so

 # Power-off alarm
-product/app/PowerOffAlarm/PowerOffAlarm.apk
-system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar
+-product/app/PowerOffAlarm/PowerOffAlarm.apk
+-system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar
 system_ext/lib64/vendor.qti.hardware.alarm@1.0.so
 vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
 vendor/bin/power_off_alarm
 vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
-vendor/lib64/vendor.qti.hardware.alarm@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.alarm@1.0.so

 # QDMA
 vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service
@@ -538,18 +569,33 @@ vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so
 vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so

 # QMI
-system/etc/permissions/qti_libpermissions.xml:system_ext/etc/permissions/qti_libpermissions.xml
-system/etc/permissions/qti_permissions.xml:system_ext/etc/permissions/qti_permissions.xml
-system/etc/sysconfig/qti_whitelist.xml
+etc/permissions/qti_libpermissions.xml:system_ext/etc/permissions/qti_libpermissions.xml
+etc/permissions/qti_permissions.xml:system_ext/etc/permissions/qti_permissions.xml
+etc/sysconfig/qti_whitelist.xml
 vendor/bin/irsc_util
 vendor/etc/sec_config
+vendor/lib/libdiag.so
+vendor/lib/libdsi_netctrl.so
+vendor/lib/libdsutils.so
+vendor/lib/libidl.so
+vendor/lib/libqcci_legacy.so
+vendor/lib/libqcmaputils.so
+vendor/lib/libqdi.so
+vendor/lib/libqdp.so
+vendor/lib/libqmi.so
 vendor/lib/libqmi_cci.so
+vendor/lib/libqmi_client_helper.so
+vendor/lib/libqmi_client_qmux.so
 vendor/lib/libqmi_common_so.so
+vendor/lib/libqmi_csi.so
 vendor/lib/libqmi_encdec.so
+vendor/lib/libqminvapi.so
+vendor/lib/libqmiservices.so
 vendor/lib64/libdiag.so
 vendor/lib64/libdsi_netctrl.so
 vendor/lib64/libdsutils.so
 vendor/lib64/libidl.so
+vendor/lib64/libqcci_legacy.so
 vendor/lib64/libqcmaputils.so
 vendor/lib64/libqdi.so
 vendor/lib64/libqdp.so
@@ -564,17 +610,17 @@ vendor/lib64/libqminvapi.so
 vendor/lib64/libqmiservices.so

 # RIL
-system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
+-system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
 system_ext/etc/permissions/qcrilhook.xml
 system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
 system_ext/etc/permissions/telephonyservice.xml
 system_ext/framework/qcrilhook.jar
 system_ext/framework/qti-telephony-common.jar
-system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-vendor/app/IWlanService/IWlanService.apk
+-system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+-vendor/app/IWlanService/IWlanService.apk
+vendor/bin/hw/qcrild
 vendor/bin/ATFWD-daemon
 vendor/bin/adpl
-vendor/bin/hw/qcrild
 vendor/bin/netmgrd
 vendor/bin/pd-mapper
 vendor/bin/port-bridge
@@ -619,7 +665,7 @@ vendor/lib64/libsystem_health_mon.so
 vendor/lib64/qcrild_librilutils.so
 vendor/lib64/qtibus.so
 vendor/lib64/qtimutex.so
-vendor/lib64/vendor.qti.hardware.radio.am@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
@@ -637,7 +683,6 @@ vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so
 vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so
 vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
-vendor/radio/qcril_database/qcril.db
 vendor/radio/qcril_database/upgrade/0_initial.sql
 vendor/radio/qcril_database/upgrade/1_version_intro.sql
 vendor/radio/qcril_database/upgrade/2_version_add_wps_config.sql
@@ -646,35 +691,25 @@ vendor/radio/qcril_database/upgrade/4_version_update_ecc_table.sql
 vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
 vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
 vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
+vendor/radio/qcril_database/qcril.db

 # SCVE
+vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so
+vendor/lib/rfsa/adsp/libscveT2T_skel.so
 vendor/lib/libscveCommon.so
 vendor/lib/libscveCommon_stub.so
 vendor/lib/libscveObjectSegmentation.so
 vendor/lib/libscveObjectSegmentation_stub.so
 vendor/lib/libscveObjectTracker.so
 vendor/lib/libscveObjectTracker_stub.so
-vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so
-vendor/lib/rfsa/adsp/libscveT2T_skel.so
 vendor/lib/vendor.qti.hardware.scve.objecttracker@1.0.so
 vendor/lib/vendor.qti.hardware.scve.panorama@1.0.so

 # SECCOMP policy
 vendor/etc/seccomp_policy/mediacodec.policy

-# Secure element - from grus
-vendor/bin/hw/vendor.qti.secure_element@1.0-service|48621dda1de283dcf0f5c93f0d17bcd53f3f2072
-vendor/etc/init/vendor.qti.secure_element@1.0-service.rc|14796c45011ad0d4735e0f3c9dbc646e6af205aa
-vendor/lib64/hw/android.hardware.secure_element@1.0-impl.so|99bb218cf8491ac7e031dc389267454b4acbcfe6
-
-# Secure element (power manager)
-vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
-vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
-vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so
-vendor/lib64/vendor.qti.esepowermanager@1.0.so
-
 # Soter
-system/app/SoterService/SoterService.apk
+-app/SoterService/SoterService.apk
 vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
 vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
@@ -686,11 +721,11 @@ vendor/bin/ssr_setup
 # Thermal engine
 vendor/bin/thermal-engine
 vendor/etc/init/init_thermal-engine.rc
-vendor/lib/libthermalclient.so
-vendor/lib64/libthermalclient.so
+-vendor/lib/libthermalclient.so
+-vendor/lib64/libthermalclient.so

 # Time services
-vendor/app/TimeService/TimeService.apk
+-vendor/app/TimeService/TimeService.apk
 vendor/bin/time_daemon
 vendor/etc/init/init.time_daemon.rc
 vendor/lib/libtime_genoff.so
@@ -727,54 +762,54 @@ vendor/bin/nv_mac
 vendor/etc/wifi/aoa_cldb_falcon.bin
 vendor/etc/wifi/aoa_cldb_swl14.bin

-# WiFi Display (system) - from salami - AP3A.240617.008
-system/framework/WfdCommon.jar|7f5fa507edca51663be2d243a3bc72799c1a31e2
-system_ext/bin/wfdservice|b7b774b649b601f5a64baf79aa5e1c530278a9bc
+# WiFi Display (system) - from KB2001 14.0.0.81(EX01)
+system/framework/WfdCommon.jar|a661c494d064b79a3f71579592411fada1ea232f
+system_ext/bin/wfdservice|400d123df78c1ed2e9643ff3ddf5ee5748f954fe
 system_ext/etc/init/wfdservice.rc|907def8565d8f91f531ca7dfad880af05d540b0c
-system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml|6669d5ee462c981663b8ac573d84d334e4eed96c
+system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml|10dcd4e58f0652d800d48ae5b76e4fab43fda214
 system_ext/etc/seccomp_policy/wfdservice.policy|5b3592c965f16b2d55ac89d56d8d3c49a6b5800b
 system_ext/etc/wfdconfigsink.xml|cb78df66948314a75080a4161321fb3111a0785a
-system_ext/lib/libmmosal.so|7afc892973a94625e92a1086df95083adab3e7f4
-system_ext/lib/libmmparser_lite.so|e2319577781704d97b31367bb8ad925771b0a846
-system_ext/lib/libmmrtpdecoder.so|0b03307d4ae7db06f227142d211ae549fe04bde9
-system_ext/lib/libmmrtpencoder.so|f4548c3d78d20237d8b12267edbe88f6d9888473
-system_ext/lib/libwfdavenhancements.so|2e691dacfbc2620d8a207954b721cef27a20864f
-system_ext/lib/libwfdclient.so|7653d1243de437e70defa3c042413f53e9435f23
-system_ext/lib/libwfdcommonutils.so|3141f605a1403af16d77d6453c40dcb19ce7a487
-system_ext/lib/libwfdconfigutils.so|c43657253de3d2711063c47956daf70ebcbb8c39
-system_ext/lib/libwfddisplayconfig.so|bb4abda7d818a359975b2c2b182894a4a13b7cf4
-system_ext/lib/libwfdmminterface.so|bdc4df873914ede0a1e8951e749f9d73b06736d1
-system_ext/lib/libwfdmmsink.so|4d1dc5fe829106715a18c61c57c0d369eec8f2dd
-system_ext/lib/libwfdmmsrc_system.so|4b2aa27983077a5536c9320d3b9c6ef5b1723c62
-system_ext/lib/libwfdrtsp.so|9a2f311df7e2fccd92724770c87841a7de80a66e
-system_ext/lib/libwfdservice.so|2c1ef6663dd85c1fdcc2dc68666dc4ec35874cc5|73bd8d9214e16155bbb8b8545c857a6a1c56c542
-system_ext/lib/libwfdsinksm.so|f61555a13f33a261e3920542af201320fa25e866
-system_ext/lib/libwfduibcinterface.so|d3fef4e928f1e93b9a868bc99bb2228650e1adac
-system_ext/lib/libwfduibcsink.so|3421f99b8cb2ba2ab0946660e6cbeec7300ed447
-system_ext/lib/libwfduibcsinkinterface.so|25df05db02190c8fa41c3ef91ef033f93ab38320
-system_ext/lib/libwfduibcsrc.so|c054e853659cb1ec6f88608ca1cd9b16b5bef5cf
-system_ext/lib/libwfduibcsrcinterface.so|5a42ebf9f56b47f34f94b18372e6451f101f8efc
-system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so|b69ef7e1022dd41b4e342856bd03675c968ef9b4
-system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so|cddecc190bd2eabb5dfea070cbb3526ec415d0b1
-system_ext/lib64/libmmosal.so|491219fad66ec89a9b049c1686c119e5e0b73ae3
-system_ext/lib64/libmmparser_lite.so|dbc8adc18ca8d9ad3eb272d08523c1a828d374c4
-system_ext/lib64/libmmrtpdecoder.so|fabbbdcd429846a9aa1f8d20b8cea8e19f6ad1d8
-system_ext/lib64/libmmrtpencoder.so|3b4c988229cc9afc9260807af108c4aa5e916763
-system_ext/lib64/libwfdclient.so|96a3e26314595b5751c1b12578a043ac3ec6a890
-system_ext/lib64/libwfdcommonutils.so|1d218b28ec0041f84e51d2996171dfc6d19b84f7
-system_ext/lib64/libwfdconfigutils.so|2afbb37792c77e2ea0e1a6719e1bd30c1fb75b5b
-system_ext/lib64/libwfddisplayconfig.so|2f251251acd4ef8a8c04aa8b1504ae72ec31d7f2
-system_ext/lib64/libwfdmminterface.so|190b323e70bad7c601e2b177718d448af49a08a6
-system_ext/lib64/libwfdmmsink.so|fffbc900181d2e19d4cf9800befacf47a1be57e4
-system_ext/lib64/libwfdnative.so;SYMLINK=system_ext/priv-app/WfdService/lib/arm64/libwfdnative.so|aa5a40b6d04cb032e305110ff3ee0b31fab5b209
-system_ext/lib64/libwfdrtsp.so|a33de8ccd94420f07fbae3e9c1c6b4988968e095
-system_ext/lib64/libwfdsinksm.so|ac0246a323cfb132ce946a17a3de01bf177a0684
-system_ext/lib64/libwfduibcinterface.so|96ed507b1698e845e3c0b73f39515aefa5971fff
-system_ext/lib64/libwfduibcsink.so|626cd1be5dcb131dc4b3ed53ed193fa082a0c617
-system_ext/lib64/libwfduibcsinkinterface.so|6294b53eced077983e5ddab21ec41a4b2d07d566
-system_ext/lib64/libwfduibcsrc.so|67630b36b0a75ceb0cb32d51b8254b0d2b6d6f92
-system_ext/lib64/libwfduibcsrcinterface.so|af85a58083be7e57be2fa062f9102c89278ad848
-system_ext/priv-app/WfdService/WfdService.apk|a45fce386941b8f1d282ccf268fef24a2d589933
+system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so|cb88bc73bf9f44d7da000a41d38b309ffdf71370
+system_ext/lib/libmmosal.so|e806f8040b4e59c6e08e437734a2176090a94ae3
+system_ext/lib/libmmparser_lite.so|873d818fbfa0ce01a1f9cd951c1fba32d4159735
+system_ext/lib/libmmrtpdecoder.so|4fc76315f11ff5fe416f36b66c9422ef05eae182
+system_ext/lib/libmmrtpencoder.so|0fa2096eec29eec395f6bd88d7d1049a127e090c
+system_ext/lib/libwfdavenhancements.so|581db496334d2adb76e6c6af67620f49ca24eabd
+system_ext/lib/libwfdclient.so|a9639d9f269880700bac6fc06e8302702fb0ab32
+system_ext/lib/libwfdcommonutils.so|b738182e77f3e7faf72460f09ebdfca7de5e0c23
+system_ext/lib/libwfdconfigutils.so|df70b2da2b8aff916a1c2f6e7365d87cf1c4ffdf
+system_ext/lib/libwfddisplayconfig.so|f46fe63fb3d58c143dc92741a962167af3d8b928
+system_ext/lib/libwfdmminterface.so|5844114d7cc823090a70fe4f44cbda0ddf585ebd
+system_ext/lib/libwfdmmsink.so|23fb5c836fc06865b229c30b46998e41c0624dac
+system_ext/lib/libwfdmmsrc_system.so|0adfc69a5560158f3a6803ba720acc795d6d05dc
+system_ext/lib/libwfdrtsp.so|afd69963c2bd59bdb3ff23e01710c61ed90c5d87
+system_ext/lib/libwfdservice.so|07e6d0e00393a8c068f75b46531d2e75fdaebde2
+system_ext/lib/libwfdsinksm.so|875171cc6ae534dd941eec1c87b78d5961e19c06
+system_ext/lib/libwfduibcinterface.so|e90fa4920b010bd6ef2bd78c2d2644cbd0fcbffa
+system_ext/lib/libwfduibcsink.so|91af548471c395a958e6155dd9be19cccbe482d3
+system_ext/lib/libwfduibcsinkinterface.so|bc0e7dca28d1e5cbc6caf5bd5378f3e6db3b460c
+system_ext/lib/libwfduibcsrc.so|a0b1c73015c449468db0d2776fdfcc56dfeee53b
+system_ext/lib/libwfduibcsrcinterface.so|2e24ec6a075407664488b4214eef35cb2ca845f4
+system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so|45a0a8cd9f1aa5cbe69b113192d42bc42e32e9c3
+system_ext/lib64/libmmosal.so|8488b27e6a9cda05c68181e8bf20afa7ba345222
+system_ext/lib64/libmmparser_lite.so|afd7b441e1bce732c14f5f8f49821d43bb2ee791
+system_ext/lib64/libmmrtpdecoder.so|0da526d51135ea58236ab6bcc2d1b7484931df24
+system_ext/lib64/libmmrtpencoder.so|fafe00d1ed3d691c6d2c2d963144218764cad5ae
+system_ext/lib64/libwfdclient.so|0070b1e88cee6ebaf17dcb02c2706232cc087071
+system_ext/lib64/libwfdcommonutils.so|14b3bd86703f2aca0abb1232d2304e626c1af644
+system_ext/lib64/libwfdconfigutils.so|3b2d91fe7efefd81a0b5cdff59b9918c063fa7a9
+system_ext/lib64/libwfddisplayconfig.so|5fd7bf7abaedfe890442f88183c49755b25c39aa
+system_ext/lib64/libwfdmminterface.so|3f16acefbe87741a5841c1c70cf74ff917299c4c
+system_ext/lib64/libwfdmmsink.so|8150b750357b606475521b491f78d566673f9888
+system_ext/lib64/libwfdnative.so|6d6dad5e631bc4d63463f608c47f3f9e5493944f
+system_ext/lib64/libwfdrtsp.so|8181e44d7c1f722218fabd8fe3bf788454a3f586
+system_ext/lib64/libwfdsinksm.so|c4d68ecbe0accd24296c18444e5a82b6a24be8d8
+system_ext/lib64/libwfduibcinterface.so|dca32fe063bdba7ce3b131b16cf112b793ae03ad
+system_ext/lib64/libwfduibcsink.so|63ea93b1a6aec75a294baf50007270807a819e21
+system_ext/lib64/libwfduibcsinkinterface.so|39c123bd9a4d7a8fa317f8ed4d86972dcfab0423
+system_ext/lib64/libwfduibcsrc.so|5557f3bd58c37b7e3b28e13f2f86d55930b14ab6
+system_ext/lib64/libwfduibcsrcinterface.so|77cead9bf7b60384fe1e11dc2b25bd99af0b4608
+system_ext/priv-app/WfdService/WfdService.apk|7191da7d336f6018ee292af4e69167677b9f5bd1

 # WiFi Display (vendor)
 vendor/bin/wfdhdcphalservice
@@ -807,7 +842,7 @@ vendor/lib/libwfduibcsinkinterface_proprietary.so
 vendor/lib/libwfduibcsrc_proprietary.so
 vendor/lib/libwfduibcsrcinterface_proprietary.so
 vendor/lib/libwfdutils_proprietary.so
-vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
 vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
 vendor/lib64/libwfdhdcpcp.so

--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -9,7 +9,6 @@ prebuilt_etc {
    name: "fstab.qcom",
    src: "etc/fstab.qcom",
    vendor: true,
-    ramdisk_available: true,
 }

 // Init scripts
@@ -46,13 +45,6 @@ prebuilt_etc {
    vendor: true,
 }

-prebuilt_etc {
-    name: "init.recovery.qcom.rc",
-    src: "etc/init.recovery.qcom.rc",
-    sub_dir: "init",
-    recovery: true,
-}
-
 prebuilt_etc {
    name: "init.target.rc",
    src: "etc/init.target.rc",
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -0,0 +1,18 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.recovery.qcom.rc
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.recovery.qcom.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := fstab.qcom_ramdisk
+LOCAL_MODULE_STEM  := fstab.qcom
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/fstab.qcom
+LOCAL_MODULE_PATH  := $(TARGET_RAMDISK_OUT)
+include $(BUILD_PREBUILT)
--- a/rootdir/etc/init.qcom.power.rc
+++ b/rootdir/etc/init.qcom.power.rc
@@ -136,8 +136,8 @@ on enable-low-power
    # Set allocstall_threshold to 0
    write /sys/module/vmpressure/parameters/allocstall_threshold 0

-    # Set swappiness to 60 for all targets
-    write /proc/sys/vm/swappiness 60
+    # Set swappiness to 100 for all targets
+    write /proc/sys/vm/swappiness 100

    # Disable wsf because we are using efk.
    # wsf Range : 1..1000 So set to bare minimum value 1.
--- a/rro_overlays/WifiOverlay/Android.bp
+++ b/rro_overlays/WifiOverlay/Android.bp
@@ -1,5 +0,0 @@
-runtime_resource_overlay {
-    name: "WifiOverlay",
-    theme: "WifiOverlay",
-    vendor: true
-}
--- a/rro_overlays/WifiOverlay/AndroidManifest.xml
+++ b/rro_overlays/WifiOverlay/AndroidManifest.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source 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.
-->
-<!-- Pixel specific wifi overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.xiaomi_sdm710"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.wifi.resources"
-      android:targetName="WifiCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source 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.
-->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds.  Do not translate.
-
-     NOTE: The naming convention is "config_camelCaseValue". Some legacy
-     entries do not follow the convention, but all new entries should. -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- boolean indicating whether the WiFi chipset has 5GHz band support.
-         Note: This config is replacing the config_wifi_dual_band_support
-         since more bands may now be supported (such as 6GHz), the naming dual_band
-         is no longer indicative, and a separate config now exists for each band -->
-    <bool translatable="false" name="config_wifi5ghzSupport">true</bool>
-
-    <!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
-    <bool translatable="false" name="config_wifi_fast_bss_transition_enabled">true</bool>
-
-    <!-- Boolean indicating whether the wifi chipset supports background scanning mechanism.
-         This mechanism allows the host to remain in suspend state and the dongle to actively
-         scan and wake the host when a configured SSID is detected by the dongle. This chipset
-         capability can provide power savings when wifi needs to be always kept on. -->
-    <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
-
-    <!-- Boolean indicating whether or not wifi should turn off when emergency call is made -->
-    <bool translatable="false" name="config_wifi_turn_off_during_emergency_call">true</bool>
-
-    <!-- Configure wifi tcp buffersizes in the form:
-         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
-    <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,8388608,262144,524288,4194304</string>
-
-    <!-- Wifi driver supports Automatic channel selection (ACS) for softap -->
-    <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool>
-
-    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
-    <bool translatable="false" name="config_wifi_softap_sae_supported">true</bool>
-
-    <!-- Wifi driver supports IEEE80211AC for softap -->
-    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
-
-    <!-- Indicates that connected MAC randomization is supported on this device -->
-    <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
-
-    <!-- Indicates that p2p MAC randomization is supported on this device -->
-    <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>
-
-    <!-- Indicates that AP mode MAC randomization is supported on this device -->
-    <bool name="config_wifi_ap_mac_randomization_supported">true</bool>
-
-    <!-- Indicates that wifi link probing is supported on this device -->
-    <bool name="config_wifi_link_probing_supported">true</bool>
-
-    <!-- Indicates that a full bugreport should be triggered when wifi diagnostics detects an error on non-user (i.e debug) builds -->
-    <bool translatable="false" name="config_wifi_diagnostics_bugreport_enabled">true</bool>
-
-    <!-- Integer indicating maximum hardware supported client number of soft ap -->
-    <integer translatable="false" name="config_wifiHardwareSoftapMaxClientCount">32</integer>
-
-    <!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR requirements -->
-    <bool translatable="false" name="config_wifi_framework_enable_sar_tx_power_limit">true</bool>
-
-    <!-- Indicate the driver support NL80211_REG_CHANGED event. -->
-    <bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">true</bool>
-</resources>
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -91,18 +91,35 @@ PRODUCT_COPY_FILES += \
    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
    frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml

+# Bluetooth
+PRODUCT_PACKAGES += \
+    android.hardware.bluetooth@1.1.vendor \
+    vendor.qti.hardware.bluetooth_audio@2.0.vendor \
+    vendor.qti.hardware.btconfigstore@1.0.vendor \
+    vendor.qti.hardware.btconfigstore@2.0.vendor
+
 # Camera
 PRODUCT_PACKAGES += \
    android.hardware.camera.provider@2.4-impl \
    android.hardware.camera.provider@2.4-service

+PRODUCT_PACKAGES += \
+    libMegviiFacepp-0.5.2 \
+    libcamera2ndk_vendor \
+    libdng_sdk.vendor \
+    libgui_vendor \
+    libmegface \
+    libstdc++_vendor \
+    vendor.qti.hardware.camera.device@1.0.vendor \
+    vendor.qti.hardware.camera.postproc@1.0.vendor
+
 # Configstore
 PRODUCT_PACKAGES += \
    disable_configstore

 # Consumer IR
 PRODUCT_PACKAGES += \
-    android.hardware.ir-service.lineage
+    android.hardware.ir-service.xiaomi

 # Device-specific settings
 PRODUCT_PACKAGES += \
@@ -116,15 +133,29 @@ PRODUCT_PACKAGES += \

 PRODUCT_PACKAGES += \
    android.hardware.graphics.composer@2.3-service \
-    hwcomposer.qcom
+    hwcomposer.sdm710

 PRODUCT_PACKAGES += \
    vendor.qti.hardware.memtrack-service

+PRODUCT_PACKAGES += \
+    libdisplayconfig.qti \
+    libdisplayconfig.system.qti \
+    libqdMetaData \
+    libqdMetaData.system \
+    libtinyxml \
+    vendor.display.config@1.0.vendor \
+    vendor.display.config@2.0 \
+    vendor.qti.hardware.display.mapper@2.0.vendor \
+    vendor.qti.hardware.display.mapper@3.0.vendor
+
 # DRM
 PRODUCT_PACKAGES += \
    android.hardware.drm-service.clearkey

+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.4.vendor
+
 # fastbootd
 PRODUCT_PACKAGES += \
    fastbootd
@@ -138,7 +169,8 @@ PRODUCT_PACKAGES += \
    libudfpshandler \
    sensors.udfps

-$(call soong_config_set,surfaceflinger,udfps_lib,//hardware/xiaomi:libudfps_extension.xiaomi)
+PRODUCT_PACKAGES += \
+    vendor.goodix.hardware.biometrics.fingerprint@2.1.vendor
 endif

 # FM
@@ -149,11 +181,31 @@ PRODUCT_PACKAGES += \
    qcom.fmradio
 endif

+# Gatekeeper
+PRODUCT_PACKAGES += \
+    android.hardware.gatekeeper@1.0.vendor
+
+# GNSS
+PRODUCT_PACKAGES += \
+    android.hardware.gnss@1.1.vendor \
+    android.hardware.gnss@2.1.vendor \
+    libsqlite.vendor
+
 # Health
 PRODUCT_PACKAGES += \
    android.hardware.health-service.qti \
    android.hardware.health-service.qti_recovery

+PRODUCT_PACKAGES += \
+    android.hardware.health@2.1.vendor
+
+# HIDL
+PRODUCT_PACKAGES += \
+    android.hidl.base@1.0 \
+    android.hidl.base@1.0.vendor \
+    libhidltransport.vendor \
+    libhwbinder.vendor
+
 # HotwordEnrollement app permissions
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/permissions/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
@@ -166,6 +218,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/keylayout/sdm670-mtp-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sdm670-mtp-snd-card_Button_Jack.kl

+# ION
+PRODUCT_PACKAGES += \
+    libion.vendor
+
 # IPACM
 PRODUCT_PACKAGES += \
    ipacm \
@@ -174,20 +230,28 @@ PRODUCT_PACKAGES += \
 # Kernel
 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true

+# Keymaster
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@4.1.vendor
+
 # Lights
 PRODUCT_PACKAGES += \
-    android.hardware.light-service.lineage
+    android.hardware.light-service.xiaomi

 # Lineage Health
 PRODUCT_PACKAGES += \
    vendor.lineage.health-service.default

-$(call soong_config_set,lineage_health,charging_control_supports_bypass,false)
-
 # LiveDisplay
 PRODUCT_PACKAGES += \
    vendor.lineage.livedisplay@2.1-service.sdm710

+# Media
+PRODUCT_PACKAGES += \
+    libavservices_minijail \
+    libavservices_minijail.vendor \
+    libavservices_minijail_vendor
+
 # Media configs
 PRODUCT_COPY_FILES += \
    frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \
@@ -197,10 +261,27 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/media/,$(TARGET_COPY_OUT_VENDOR)/etc)

+# Mlipay
+PRODUCT_PACKAGES += \
+    vendor.xiaomi.hardware.mlipay@1.1.vendor \
+    vendor.xiaomi.hardware.mtdservice@1.2.vendor
+
+# Net
+PRODUCT_PACKAGES += \
+    android.system.net.netd@1.1.vendor
+
+# Neural networks
+PRODUCT_PACKAGES += \
+    android.hardware.neuralnetworks@1.3.vendor
+
 # NFC
+ifeq ($(TARGET_HAS_NFC),true)
 PRODUCT_PACKAGES += \
    android.hardware.nfc@1.2-service \
    com.android.nfc_extras \
+    libchrome.vendor \
+    NfcNci \
+    SecureElement \
    Tag

 PRODUCT_COPY_FILES += \
@@ -217,10 +298,19 @@ PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
    frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \
    frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
+endif
+
+PRODUCT_PACKAGES += \
+    android.hardware.secure_element@1.2.vendor

 # OMX
 PRODUCT_PACKAGES += \
+    libOmxAacEnc \
+    libOmxAmrEnc \
    libOmxCore \
+    libOmxEvrcEnc \
+    libOmxG711Enc \
+    libOmxQcelp13Enc \
    libOmxVdec \
    libOmxVenc \
    libstagefrighthw
@@ -236,11 +326,6 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += $(LOCAL_PATH)/overlay/packages/apps/Car
 # Partitions
 PRODUCT_USE_DYNAMIC_PARTITIONS := true

-PRODUCT_PACKAGES += \
-    vendor_bt_firmware_mountpoint \
-    vendor_dsp_mountpoint \
-    vendor_firmware_mnt_mountpoint
-
 # Power
 PRODUCT_PACKAGES += \
    android.hardware.power-service.lineage-libperfmgr \
@@ -262,14 +347,29 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt

-# QTI fwk-detect
+# QMI
 PRODUCT_PACKAGES += \
-    libqti_vndfwk_detect.vendor
+    libjson \
+    libqti_vndfwk_detect \
+    libqti_vndfwk_detect.vendor \
+    libvndfwk_detect_jni.qti \
+    libvndfwk_detect_jni.qti.vendor
+
+# RIL
+PRODUCT_PACKAGES += \
+    libprotobuf-cpp-full \
+    librmnetctl \
+    libxml2
+
+PRODUCT_PACKAGES += \
+    android.hardware.radio@1.6.vendor \
+    android.hardware.radio.config@1.3.vendor \
+    android.hardware.radio.deprecated@1.0.vendor

 # Rootdir
 PRODUCT_PACKAGES += \
    fstab.qcom \
-    fstab.qcom.ramdisk
+    fstab.qcom_ramdisk

 PRODUCT_PACKAGES += \
    init.qcom.early_boot.sh \
@@ -286,9 +386,13 @@ PRODUCT_PACKAGES += \

 # Sensors
 PRODUCT_PACKAGES += \
+    android.frameworks.sensorservice@1.0.vendor \
    android.hardware.sensors@1.0-impl \
    android.hardware.sensors@1.0-service

+PRODUCT_PACKAGES += \
+    libsensorndkbridge
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
    $(LOCAL_PATH) \
@@ -303,6 +407,7 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_PACKAGES += \
    ims-ext-common \
    ims_ext_common.xml \
+    libgui_shim \
    qti-telephony-hidl-wrapper \
    qti_telephony_hidl_wrapper.xml \
    qti-telephony-utils \
@@ -314,12 +419,12 @@ PRODUCT_BOOT_JARS += \

 # Thermal
 PRODUCT_PACKAGES += \
-    android.hardware.thermal-service.qti
+    android.hardware.thermal@2.0-service.qti

 # USB
 PRODUCT_PACKAGES += \
    android.hardware.usb@1.3-service.dual_role_usb \
-    android.hardware.usb.gadget-service.qti
+    android.hardware.usb.gadget@1.2-service-qti

 PRODUCT_PACKAGES += \
    init.qcom.usb.rc \
@@ -330,6 +435,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
    vendor.qti.hardware.vibrator.service

+# VNDK
+PRODUCT_COPY_FILES += \
+    prebuilts/vndk/v33/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v33.so
+
 # Wi-Fi
 PRODUCT_PACKAGES += \
    android.hardware.wifi-service \
@@ -337,7 +446,8 @@ PRODUCT_PACKAGES += \
    libwpa_client \
    libwifi-hal-ctrl \
    libwifi-hal-qcom \
-    WifiOverlay \
+    vendor.qti.hardware.wifi.hostapd@1.2.vendor \
+    vendor.qti.hardware.wifi.supplicant@2.1.vendor \
    wpa_supplicant \
    wpa_supplicant.conf

@@ -352,7 +462,11 @@ PRODUCT_COPY_FILES += \

 # Wi-Fi Display
 PRODUCT_PACKAGES += \
-    libwfdaac_vendor
+    android.media.audio.common.types-V2-cpp \
+    libnl \
+    libpng.vendor \
+    libwfdaac_vendor \
+    vendor.qti.hardware.display.config-V5-ndk

 PRODUCT_BOOT_JARS += \
    WfdCommon
--- a/sepolicy/vendor/device.te
+++ b/sepolicy/vendor/device.te
@@ -2,6 +2,8 @@ type fingerprint_device, dev_type;

 type gps_device, dev_type;

+type lirc_device, dev_type;
+
 type ultrasound_device, dev_type;

 # Treat non-super block devices as super block devices for retrofit
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -54,14 +54,21 @@
 /dev/socket/gps                                                                                     u:object_r:vendor_gps_socket:s0
 /sys/devices/platform/soc/[0-9]+\.spi/spi_master/spi[0-9]+/spi[0-9]+\.0/nstandby                    u:object_r:sysfs_gps:s0

+# IR
+/vendor/bin/hw/android\.hardware\.ir-service\.xiaomi                                                u:object_r:hal_ir_default_exec:s0
+
 # IR devices
 /dev/ir_spi                                                                                         u:object_r:lirc_device:s0
+/dev/lirc[0-9]+                                                                                     u:object_r:lirc_device:s0
 /dev/spidev[0-9]+\.1                                                                                u:object_r:lirc_device:s0

 # LED
 /sys/devices/platform/soc/[a-z0-9]+.qcom,spmi/spmi-[0-1]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,leds@d000/leds(/.*)?    u:object_r:sysfs_leds:s0
 /sys/devices/platform/soc/[a-z0-9]+.i2c/i2c-[0-9]/[0-9]-[a-z0-9]+/leds(/.*)?                        u:object_r:sysfs_leds:s0

+# Lights
+/vendor/bin/hw/android\.hardware\.light-service\.xiaomi                                             u:object_r:hal_light_default_exec:s0
+
 # Mlipay
 /vendor/bin/mlipayd@1\.1                                                                            u:object_r:hal_mlipay_default_exec:s0

--- a/sepolicy/vendor/hal_ir_default.te
+++ b/sepolicy/vendor/hal_ir_default.te
@@ -0,0 +1,2 @@
+allow hal_ir_default lirc_device:chr_file rw_file_perms;
+allow hal_ir_default lirc_device:file rw_file_perms;
--- a/setup-makefiles.py
+++ b/setup-makefiles.py
@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../.."
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+# Initialize the helper for common
+setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
+
+# Warning headers and guards
+write_headers "grus pyxis xmsirius vela"
+
+# The standard common blobs
+write_makefiles "${MY_DIR}/proprietary-files.txt" true
+
+printf "\n%s\n" "ifeq (\$(TARGET_HAS_NFC),true)" >> "${PRODUCTMK}"
+write_makefiles "${MY_DIR}/proprietary-files-nfc.txt" true
+echo "endif" >> "${PRODUCTMK}"
+
+# Finish
+write_footers
+
+if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
+    # Reinitialize the helper for device
+    setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false
+
+    # Warning headers and guards
+    write_headers
+
+    # The standard device blobs
+    write_makefiles "${MY_DIR}/../${DEVICE}/proprietary-files.txt" true
+
+    # Finish
+    write_footers
+fi
--- a/vendor.prop
+++ b/vendor.prop
@@ -220,7 +220,6 @@ persist.rcs.supported=1
 persist.vendor.ssr.restart_level=ALL_ENABLE

 # USB
-ro.usb.uvc.disable_video_encode_flag=true
 ro.usb.uvc.enabled=true
 sys.usb.mtp.batchcancel=1
 vendor.usb.controller=a600000.dwc3
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -274,6 +274,10 @@ gEnableMCCAdaptiveScheduler=1
 #Enable or Disable p2p device address administered
 isP2pDeviceAddrAdministrated=0

+# Set Thermal Power limit
+TxPower2g=10
+TxPower5g=10
+
 # Remove Overlap channel restriction
 gEnableOverLapCh=0

@@ -340,6 +344,19 @@ gSapSccChanAvoidance=0
 # Inactivity time (in ms) to end TX Service Period while in IBSS power save mode
 gIbssTxSpEndInactivityTime=10

+# Enable support for TDLS
+#  0 - disable
+#  1 - enable
+gEnableTDLSSupport=1
+
+# Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
+# initiate TDLS Discovery towards a peer whenever setup criteria (throughput
+# and RSSI) is met and then will initiate teardown when teardown criteria
+# (idle packet count and RSSI) is met.
+#  0 - disable
+#  1 - enable
+gEnableTDLSImplicitTrigger=1
+
 # Enable TDLS External Control. That is, user space application has to
 # first configure a peer MAC in wlan driver towards which TDLS is desired.
 # Device will establish TDLS only towards those configured peers whenever
@@ -554,6 +571,9 @@ enable_ftopen=0
 # 1 - Allow STA+SAP SCC on LTE coex channel
 g_sta_sap_scc_on_lte_coex_chan=1

+#Add another interface while driver load
+gEnableConcurrentSTA=wlan1
+
 # This ini is used to allow STA+SAP SCC on DFS channel with master mode
 # support disabled
 # 0 - Disallow STA+SAP SCC on DFS channel
@@ -584,28 +604,19 @@ gTxBFCsnValue=4
 ignore_fw_reg_offload_ind=1

 #Configures Channel Bonding in 24 GHz
-gChannelBondingMode24GHz=1
+gChannelBondingMode24GHz=0

 #Enable ETSI SRD channels in master mode PCL and ACS functionality
 etsi13_srd_chan_in_master_mode=1

-# Enable wpa3 on sdm710 device
-sae_enabled=1
+# Disable wpa3 on 7150 device
+sae_enabled=0

 # Reduce the expiry time for avoid list and black list in drv.
 avoid_list_expiry_time=3
 black_list_expiry_time=3
 # Improve threshold to move the Ap from avoid to blacklist
 bad_bssid_counter_thresh=7
-
-# Prefer connecting to 5Ghz AP
-# even if its RSSI is lower by 3dBm than the 2.4Ghz AP
-gRoamPrefer5GHz=1
-gSelect5GHzMargin=3
-
-# Enable SoftAP on indoor channel
-gindoor_channel_support=1
-
 END

 # Note: Configuration parser would not read anything past the END marker
Author	SHA1	Message	Date
Rodney Etienne	91c13abaf3	sdm710-common: Add vendor	2024-10-16 15:27:55 -04:00
Rodney Etienne	fe252e5146	sdm710-common: Fix up dependencies	2024-10-16 15:15:30 -04:00
Sebastiano Barezzi	b5392cec63	sdm710-common: Move to Xiaomi IR AIDL Change-Id: I46094bcbfaba252b5d98ea8211b927fdaa079e2d	2024-10-16 15:09:58 -04:00
Yumi Yukimura	e4af6c3a11	sdm710-common: Switch to QTI Memtrack AIDL HAL Change-Id: Ibcbaff02fd56fbccc3a88c01a5f46a89cb212ef5	2024-10-16 15:09:35 -04:00
DeadSomeOne	e9cf214ca3	sdm710-common: Build additional packages Both packages are required for WFD display or it will crash and display the following: E AndroidRuntime: FATAL EXCEPTION: binder:13993_3 E AndroidRuntime: Process: com.qualcomm.wfd.service:wfd_service, PID: 13993 E AndroidRuntime: java.lang.UnsatisfiedLinkError: dlopen failed: library "vendor.qti.hardware.display.config-V5-ndk.so" not found: needed by /system_ext/lib64/libwfddisplayconfig.so in namespace clns-shared-4 E AndroidRuntime: at java.lang.Runtime.loadLibrary0(Runtime.java:1081) E AndroidRuntime: at java.lang.Runtime.loadLibrary0(Runtime.java:1003) E AndroidRuntime: at java.lang.System.loadLibrary(System.java:1765) E AndroidRuntime: at com.qualcomm.wfd.WFDSession.<clinit>(WFDSession.java:56) E AndroidRuntime: at com.qualcomm.wfd.service.SessionManagerService.setDeviceType(SessionManagerService.java:220) E AndroidRuntime: at com.qualcomm.wfd.service.ISessionManagerService$Stub.onTransact(ISessionManagerService.java:651) E AndroidRuntime: at android.os.Binder.execTransactInternal(Binder.java:1505) E AndroidRuntime: at android.os.Binder.execTransact(Binder.java:1444) F linker : CANNOT LINK EXECUTABLE "/system_ext/bin/wfdservice": library "android.media.audio.common.types-V2-cpp.so" not found: needed by /system_ext/lib/libwfdservice.so in namespace (default)	2024-07-07 23:14:53 -04:00
Rodney Etienne	e924a84185	sdm710-common: Initialize for Evolution X 9.x	2024-07-05 16:17:36 -04:00
Rodney Etienne	304a1022b9	sdm710-common: fix missing separator	2024-07-01 17:12:13 -04:00
Rodney Etienne	5505bb39b3	sdm710-common: Setup DeviceAsWebcam * USB VID & PID are taken from gs101 UsbGadget.cpp * bDeviceClass related entries are taken from init.qcom.usb.rc	2024-07-01 16:59:35 -04:00
Rodney Etienne	a6bbd773fe	sdm710-common: Remove software omx codec references These are no longer available as of Android 14 QPR3. The C2 codecs available by default in the swcodec apex will be used instead.	2024-07-01 16:21:39 -04:00
Rodney Etienne	1af6e96f5e	sdm710-common: Import media codecs files We need to remove references to software OMX codecs so we cannot ship it via proprietary-files.txt	2024-07-01 16:19:20 -04:00
Rodney Etienne	8751434b8f	sdm710-common: Build missing libraries for 14 QPR3	2024-07-01 16:16:54 -04:00
Rodney Etienne	d3f2aad977	sdm710-common: Remove unused manifest entries	2024-07-01 16:13:57 -04:00
Rodney Etienne	7039fde736	sdm710-common: Add a device specific FCM	2024-07-01 16:12:48 -04:00
Rodney Etienne	f829507e1d	sdm710-common: Inherit from legacy QTI FCM	2024-07-01 16:11:18 -04:00
Rodney Etienne	fffd053076	sdm710-common: Include lineage DCM	2024-07-01 16:10:06 -04:00
Rodney Etienne	86c7d55f3f	sdm710-common: Inherit from QTI and common Xiaomi FCMs	2024-07-01 16:08:13 -04:00
Rodney Etienne	5e1ea7e816	sdm710-common: Set manifest target-level to 5	2024-07-01 16:07:08 -04:00
Rodney Etienne	bd207a5299	sdm710-common: Disable the usage of ConfigStore. * As per commit LineageOS/android_hardware_interfaces@11a113a ("Add disable_configstore").	2024-07-01 16:06:11 -04:00
Rodney Etienne	fca082d6cb	sdm710-common: Set debug.sf.auto_latch_unsignaled to 0 Need to explicitly set auto_latch_unsignaled property to disabled state to keep latch-unsignaled as the default behavior.	2024-07-01 16:03:03 -04:00
Rodney Etienne	b866caa030	sdm710-common: Enforce vintf kernel requirements The build system enables this for shipping API level >=29 but we also want it to pass the vintf runtime checks.	2024-07-01 16:01:48 -04:00
Rodney Etienne	4a7fc9dba5	sdm710-common: Use the common device compatibility matrix from QCOM	2024-07-01 16:00:27 -04:00
Rodney Etienne	64a82448c3	sdm710-common: Remove optional="true" hidl(s) from compatibility matrix - vendor.qti.hardware.wifi.keystore is no longer used: * We build full Wi-Fi HAL from (AOSP) source. - vendor.qti.hardware.sigma_miracast is no longer used: * (It seems) Wi-Fi Display doesn't need this to be working.	2024-07-01 15:58:01 -04:00
Rodney Etienne	7463746653	sdm710-common: parts: Convert to SwitchPreferenceCompat	2024-07-01 15:56:01 -04:00
Rodney Etienne	7d5d880d29	sdm710-common: Update WFD system stack from OOS 14.0.0.81(EX01)	2024-07-01 15:52:41 -04:00
Rodney Etienne	52b6aa88ed	sdm710-common: Add missing permissions for WFD Fix missing WFD permissions file after the WFD update introduced by commit `1b61c7b` ("sdm710-common: Update WFD system stack from T blobs"). Fixes: `1b61c7b` ("sdm710-common: Update WFD system stack from T blobs")	2024-07-01 15:47:02 -04:00
Rodney Etienne	e74d5980f3	sdm710-common: Remove doze ovelay that's not needed anymore.	2024-06-20 19:05:59 -04:00
Rodney Etienne	a67df7fa2c	sdm710-common: correct overlay path && update Aux Cameras ID	2024-06-08 15:44:32 -04:00
Sebastiano Barezzi	45c664d099	sdm710-common: sepolicy: Rework and cleanup Change-Id: I12c97fe8f543b6c466cd6fc38479582ddca37156	2024-06-05 21:20:33 -04:00
Rodney Etienne	14c7370215	sdm710-common: overlay: Update CarrierConfig from phone1 * From Nothing OS 2.0.4	2024-06-05 20:26:03 -04:00
Rodney Etienne	65cae7c383	sdm710-common:overlay: Enable call recording	2024-06-05 20:23:49 -04:00
Rodney Etienne	eb0f84f837	sdm710-common: overlay: Enable volume steps settings	2024-06-05 18:48:16 -04:00
Rodney Etienne	160d3be13f	sdm710-common: overlay: Enable double tap to ambient	2024-06-05 18:46:59 -04:00
Rodney Etienne	6b33663708	sdm710-common: overlay: Hide vendor security patch level	2024-06-05 06:29:31 -04:00
Sebastiano Barezzi	509c0d5dde	sdm710-common: Revert "Fix charger init trigger event after health AIDL move" https://github.com/LineageOS/android_system_core/blob/lineage-21.0/init/init.cpp#L1099 This reverts commit `555d5baf6b`. Change-Id: I284f80f364e9057a8373a015f0acaee3ef9e395d	2024-06-04 20:00:37 -04:00
Rodney Etienne	41dd79a101	sdm710-common: props: Disable display refresh rate override This got enabled by default on U, and it causes apps like Chrome and Youtube to set the refresh rate to 30FPS when playing some videos.	2024-06-04 14:23:59 -04:00
Georg Veichtlbauer	ac7cf04563	sdm710-common: powerhint: Add DT2W Change-Id: I7d0dfe249798864a39afd4f339b692584faaf3ec	2024-05-30 14:31:09 -04:00
Bruno Martins	96c588eb97	sdm710-common: Use common libqti-perfd-client and power-libperfmgr Change-Id: I22d6b35c72629553817005deaefcae60abc72cfd	2024-05-30 14:26:27 -04:00
Rodney Etienne	d77c5c1f85	sdm710-common: Address some denials	2024-05-30 13:04:26 -04:00
Rodney Etienne	ee740f2ae2	sdm710-common: Initialize for Evolution X 9.x	2024-05-16 20:57:15 -04:00
RODNEY ETIENNE	47a3ddff77	sdm710-common: Initialize for Evolution X 9.x	2024-05-09 16:28:56 -04:00
RODNEY ETIENNE	f133b074d4	sdm710-common: Bring up for Evo X A14	2024-04-21 18:39:54 -04:00
				`@@ -1 +0,0 @@`
				`#!./extract-files.py --regenerate_makefiles`