diff --git a/common.mk b/common.mk
index fdf26ccd..490ae189 100644
--- a/common.mk
+++ b/common.mk
@@ -78,6 +78,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
     frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
+    frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
     frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9758e2aa..5c3d0ea8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -48,6 +48,7 @@ vendor/lib/rfsa/adsp/libVC1DecDsp_skel.so
 framework/vendor.qti.hardware.alarm-V1.0-java.jar
 -vendor/app/PowerOffAlarm/PowerOffAlarm.apk
 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
@@ -59,12 +60,16 @@ lib64/com.qualcomm.qti.ant@1.0.so
 -lib64/libantradio.so
 
 # ANT+ (vendor)
-vendor/lib/com.qualcomm.qti.ant@1.0.so
 vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so
-vendor/lib64/com.qualcomm.qti.ant@1.0.so
+vendor/lib/com.qualcomm.qti.ant@1.0.so
 vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
+vendor/lib64/com.qualcomm.qti.ant@1.0.so
 
 # Audio
+vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service
+vendor/etc/dolby/dax-default.xml
+vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc
+vendor/etc/media_codecs_dolby_audio.xml
 vendor/lib/hw/audio.primary.msmnile.so
 vendor/lib/libacdb-fts.so
 vendor/lib/libacdbloader.so
@@ -75,6 +80,7 @@ vendor/lib/libaudcal.so
 vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudioalsa.so
 vendor/lib/libaudioparsers.so
+vendor/lib/libdapparamstorage.so
 vendor/lib/libdrc.so
 vendor/lib/libqtigef.so
 vendor/lib/libsurround_3mic_proc.so
@@ -91,6 +97,7 @@ vendor/lib/soundfx/libqcvirt.so
 vendor/lib/soundfx/libshoebox.so
 vendor/lib/soundfx/libswdap.so
 vendor/lib/soundfx/libvolumelistener.so
+vendor/lib/vendor.dolby.hardware.dms@1.0.so
 vendor/lib64/hw/audio.primary.msmnile.so
 vendor/lib64/libacdb-fts.so
 vendor/lib64/libacdbloader.so
@@ -100,6 +107,8 @@ vendor/lib64/libaudcal.so
 vendor/lib64/libaudio_log_utils.so
 vendor/lib64/libaudioalsa.so
 vendor/lib64/libaudioparsers.so
+vendor/lib64/libdapparamstorage.so
+vendor/lib64/libdlbdsservice.so
 vendor/lib64/libqtigef.so
 vendor/lib64/libtinycompress_vendor.so
 vendor/lib64/soundfx/libasphere.so
@@ -112,20 +121,26 @@ vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libshoebox.so
 vendor/lib64/soundfx/libswdap.so
 vendor/lib64/soundfx/libvolumelistener.so
+vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so
+vendor/lib64/vendor.dolby.hardware.dms@1.0.so
 
 # Audio amplifier firmware
 vendor/firmware/tfa98xx.cnt
 vendor/firmware/tfa98xx_11811.cnt
 
 # Bluetooth
+vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/bin/hci_qcomm_init
 vendor/bin/wcnss_filter
-vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
+vendor/lib/com.qualcomm.qti.bluetooth_audio@1.0.so
 vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
+vendor/lib/hw/com.qualcomm.qti.bluetooth_audio@1.0-impl.so
 vendor/lib/libbt-hidlclient.so
 vendor/lib/libbtnv.so
+vendor/lib64/com.qualcomm.qti.bluetooth_audio@1.0.so
 vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
+vendor/lib64/hw/com.qualcomm.qti.bluetooth_audio@1.0-impl.so
 vendor/lib64/libbt-hidlclient.so
 vendor/lib64/libbtnv.so
 
@@ -135,6 +150,7 @@ lib64/libaptXHD_encoder.so|90f47f10af28b3ead143200cb4370b847c513127
 
 # Camera
 vendor/bin/hw/vendor.oneplus.camera.CameraHIDL@1.0-service
+vendor/bin/vl53l1_daemon_main
 vendor/etc/camera/arccali.bin
 vendor/etc/camera/ashdr/iso617_4608x3456.ncf
 vendor/etc/camera/ashdr/ncf_pack.ncf
@@ -259,6 +275,7 @@ vendor/lib/libtriplecam_optical_zoom_control.so
 vendor/lib/libtriplecam_video_optical_zoom.so
 vendor/lib/libvideoutils.so
 vendor/lib/libvidhance.so
+vendor/lib/libvl53l1_daemon.so
 vendor/lib/sensors.hal.tof.so
 vendor/lib/vendor.oneplus.camera.CameraHIDL@1.0.so
 vendor/lib64/camera/com.qti.sensor.gc5035.so
@@ -377,6 +394,7 @@ vendor/lib64/libtriplecam_image_optical_zoom.so
 vendor/lib64/libtriplecam_optical_zoom_control.so
 vendor/lib64/libtriplecam_video_optical_zoom.so
 vendor/lib64/libvidhance.so
+vendor/lib64/libvl53l1_daemon.so
 vendor/lib64/sensors.hal.tof.so
 vendor/lib64/vendor.oneplus.camera.CameraHIDL@1.0.so
 
@@ -480,14 +498,30 @@ vendor/lib64/vendor.qti.data.factory@1.1.so
 vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so
 vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so
 
+# CVP
+vendor/lib/libcvp.so
+vendor/lib/libcvp_common.so
+vendor/lib/libcvp_stub.so
+vendor/lib/vendor.qti.hardware.cvp@1.0.so
+vendor/lib64/libcvp.so
+vendor/lib64/libcvp_common.so
+vendor/lib64/libcvp_stub.so
+vendor/lib64/vendor.qti.hardware.cvp@1.0.so
+
 # DASH
 -sbin/dashd;rootfs
 
 # Display
 -lib/libsdm-disp-apis.so
 -lib64/libsdm-disp-apis.so
+vendor/bin/hw/vendor.oneplus.hardware.display@1.0-service
 vendor/bin/hw/vendor.qti.hardware.display.allocator@1.0-service
+vendor/bin/qdcmss
+vendor/etc/hdr_config.cfg
+vendor/etc/init/qdcmss.rc
+vendor/etc/init/vendor.oneplus.hardware.display@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.display.allocator@1.0-service.rc
+vendor/etc/sdr_config.cfg
 vendor/lib/hw/android.hardware.graphics.mapper@2.0-impl-qti-display.so
 vendor/lib/hw/gralloc.msmnile.so
 vendor/lib/hw/hwcomposer.msmnile.so
@@ -523,6 +557,7 @@ vendor/lib64/libdisplayqos.so
 vendor/lib64/libdpps.so
 vendor/lib64/libgpu_tonemapper.so
 vendor/lib64/libgralloccore.so
+vendor/lib64/libgrallocutils.so
 vendor/lib64/libqdMetaData.so
 vendor/lib64/libqdutils.so
 vendor/lib64/libqservice.so
@@ -593,13 +628,13 @@ vendor/lib64/libdpmqmihal.so
 
 # DRM
 vendor/bin/hw/android.hardware.drm@1.1-service.widevine
+vendor/bin/hw/vendor.oneplus.hardware.drmkey@1.0-service
+vendor/bin/hw/vendor.oneplus.hardware.hdcpkey@1.0-service
 vendor/bin/qseecomd
+vendor/etc/gpfspath_oem_config.xml
 vendor/etc/init/android.hardware.drm@1.1-service.widevine.rc
-vendor/lib/libGPreqcancel.so
-vendor/lib/libGPreqcancel_svc.so
-vendor/lib/libQSEEComAPI.so
-vendor/lib/libSecureUILib.so
-vendor/lib/libStDrvInt.so
+vendor/etc/init/vendor.oneplus.hardware.drmkey@1.0-service.rc
+vendor/etc/init/vendor.oneplus.hardware.hdcpkey@1.0-service.rc
 vendor/lib/libbase64.so
 vendor/lib/libcpion.so
 vendor/lib/libcppf.so
@@ -607,23 +642,24 @@ vendor/lib/libdrm.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
 vendor/lib/libdrmutils.so
+vendor/lib/libGPreqcancel.so
+vendor/lib/libGPreqcancel_svc.so
 vendor/lib/libhdcpsrm.so
 vendor/lib/liboemcrypto.so
+vendor/lib/libops.so
 vendor/lib/libqisl.so
+vendor/lib/libQSEEComAPI.so
 vendor/lib/librmp.so
 vendor/lib/librpmb.so
 vendor/lib/libsdedrm.so
 vendor/lib/libsecureui.so
 vendor/lib/libsecureui_svcsock.so
+vendor/lib/libSecureUILib.so
+vendor/lib/libspl.so
 vendor/lib/libssd.so
+vendor/lib/libStDrvInt.so
 vendor/lib/libtzdrmgenprov.so
 vendor/lib/mediadrm/libwvdrmengine.so
-vendor/lib64/libGPreqcancel.so
-vendor/lib64/libGPreqcancel_svc.so
-vendor/lib64/libwvhidl.so
-vendor/lib64/libQSEEComAPI.so
-vendor/lib64/libSecureUILib.so
-vendor/lib64/libStDrvInt.so
 vendor/lib64/libbase64.so
 vendor/lib64/libcpion.so
 vendor/lib64/libcppf.so
@@ -631,17 +667,27 @@ vendor/lib64/libdrm.so
 vendor/lib64/libdrmfs.so
 vendor/lib64/libdrmtime.so
 vendor/lib64/libdrmutils.so
+vendor/lib64/libGPreqcancel.so
+vendor/lib64/libGPreqcancel_svc.so
 vendor/lib64/libhdcpsrm.so
 vendor/lib64/liboemcrypto.so
+vendor/lib64/libops.so
 vendor/lib64/libqisl.so
+vendor/lib64/libQSEEComAPI.so
 vendor/lib64/librmp.so
 vendor/lib64/librpmb.so
 vendor/lib64/libsdedrm.so
 vendor/lib64/libsecureui.so
 vendor/lib64/libsecureui_svcsock.so
+vendor/lib64/libSecureUILib.so
+vendor/lib64/libspl.so
 vendor/lib64/libssd.so
+vendor/lib64/libStDrvInt.so
 vendor/lib64/libtzdrmgenprov.so
+vendor/lib64/libwvhidl.so
 vendor/lib64/mediadrm/libwvdrmengine.so
+vendor/lib64/vendor.oneplus.hardware.drmkey@1.0.so
+vendor/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so
 
 # DRM firmware
 vendor/firmware/cppf.b00
@@ -713,7 +759,9 @@ vendor/lib/vendor.qti.hardware.fingerprint@1.0.so
 vendor/lib64/fp_hal_extension.so
 vendor/lib64/hw/goodix.fod.msmnile.so
 vendor/lib64/hw/silead.fod.msmnile.so
+vendor/lib64/libarm_proxy_skel.so
 vendor/lib64/libgf_ud_hal.so
+vendor/lib64/libhvx_proxy_stub.so
 vendor/lib64/libqfp-service.so
 vendor/lib64/libsl_fp_algo.so
 vendor/lib64/libsl_fp_impl.so
@@ -734,12 +782,15 @@ vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 
 # GPS
-vendor/bin/garden_app
 vendor/bin/hw/vendor.qti.gnss@2.1-service
+vendor/bin/garden_app
 vendor/bin/loc_launcher
 vendor/bin/lowi-server
+vendor/bin/mlid
 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/vendor.qti.gnss@2.1-service.rc
 vendor/etc/xtra_root_cert.pem
@@ -852,6 +903,11 @@ vendor/firmware/a640_zap.mdt
 vendor/firmware/leia_pfp_470.fw
 vendor/firmware/leia_pm4_470.fw
 
+# IFAA
+vendor/bin/hw/vendor.oneplus.hardware.ifaa@2.0-service
+vendor/etc/init/vendor.oneplus.hardware.ifaa@2.0-service.rc
+vendor/lib64/vendor.oneplus.hardware.ifaa@2.0.so
+
 # IO Prefetcher
 vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
 vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc
@@ -883,11 +939,13 @@ vendor/lib/libkeymasterdeviceutils.so
 vendor/lib/libkeymasterprovision.so
 vendor/lib/libkeymasterutils.so
 vendor/lib/libqtikeymaster4.so
+vendor/lib/libspcom.so
 vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
 vendor/lib64/libkeymasterdeviceutils.so
 vendor/lib64/libkeymasterprovision.so
 vendor/lib64/libkeymasterutils.so
 vendor/lib64/libqtikeymaster4.so
+vendor/lib64/libspcom.so
 
 # Latency
 framework/vendor.qti.hardware.data.latency-V1.0-java.jar
@@ -911,6 +969,7 @@ vendor/lib/libgcs-ipc.so
 vendor/lib/libgcs-osal.so
 vendor/lib/libgcs.so
 vendor/lib/liblistensoundmodel2.so
+vendor/lib/libmulawdec.so
 vendor/lib/libsmwrapper.so
 vendor/lib64/hw/sound_trigger.primary.msmnile.so
 vendor/lib64/libcapiv2svacnn.so
@@ -920,6 +979,12 @@ vendor/lib64/libgcs-ipc.so
 vendor/lib64/libgcs-osal.so
 vendor/lib64/libgcs.so
 vendor/lib64/liblistensoundmodel2.so
+vendor/lib64/libmulawdec.so
+
+# Machine learning
+vendor/lib64/hw/vendor.qti.hardware.mlshal@1.0-impl.so
+vendor/lib64/vendor.qti.hardware.mlshal@1.0-halimpl.so
+vendor/lib64/vendor.qti.hardware.mlshal@1.0.so
 
 # Media
 lib/extractors/libmmparser.so
@@ -930,6 +995,9 @@ lib/libOmxMux.so
 lib/vendor.qti.hardware.vpp@1.1.so
 lib64/libmmosal.so
 lib64/vendor.qti.hardware.vpp@1.1.so
+vendor/bin/vppservice
+vendor/etc/system_properties.xml
+vendor/etc/vpp/tunings.txt
 vendor/lib/libAlacSwDec.so
 vendor/lib/libApeSwDec.so
 vendor/lib/libarbitrarybytes.so
@@ -972,6 +1040,7 @@ vendor/lib/libstagefright_soft_qtiflacdec.so
 vendor/lib/libstagefrightdolby.so
 vendor/lib/libstagefrighthw.so
 vendor/lib/libvppclient.so
+vendor/lib/libvpphcp.so
 vendor/lib/libvpphvx.so
 vendor/lib/libvpplibrary.so
 vendor/lib/libvpptestutils.so
@@ -1017,6 +1086,7 @@ vendor/lib64/libstagefright_soft_qtiflacdec.so
 vendor/lib64/libstagefrightdolby.so
 vendor/lib64/libstagefrighthw.so
 vendor/lib64/libvppclient.so
+vendor/lib64/libvpphcp.so
 vendor/lib64/libvpphvx.so
 vendor/lib64/libvpplibrary.so
 vendor/lib64/libvpptestutils.so
@@ -1077,6 +1147,7 @@ vendor/lib/libp61-jcop-kit.so
 vendor/lib/libpn553_fw.so
 vendor/lib64/ese_spi_nxp.so
 vendor/lib64/libp61-jcop-kit.so
+vendor/lib64/ls_client.so
 vendor/lib64/nfc_nci_nxp.so
 vendor/lib64/vendor.nxp.nxpese@1.0.so
 vendor/lib64/vendor.nxp.nxpnfc@1.0.so
@@ -1185,8 +1256,11 @@ framework/qcrilhook.jar
 framework/qti-telephony-common.jar|b1d392dbc9b06ac8d650b874c502da0a3fff81c7
 framework/QtiTelephonyServicelibrary.jar
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-vendor/bin/ATFWD-daemon
 vendor/bin/hw/qcrild
+vendor/bin/hw/vendor.oneplus.hardware.param@1.0-service
+vendor/bin/adpl
+vendor/bin/ATFWD-daemon
+vendor/bin/diag_mdlog
 vendor/bin/ipacm-diag
 vendor/bin/netmgrd
 vendor/bin/port-bridge
@@ -1199,8 +1273,11 @@ vendor/bin/tftp_server
 vendor/etc/data/dsi_config.xml
 vendor/etc/data/netmgr_config.xml
 vendor/etc/init/qcrild.rc
+vendor/etc/init/vendor.oneplus.hardware.param@1.0-service.rc
 vendor/lib/lib_remote_simlock.so
 vendor/lib/libmdmdetect.so
+vendor/lib/libparam_vendor.so (oneplus param?)
+vendor/lib/vendor.oneplus.hardware.param@1.0.so
 vendor/lib64/lib_remote_simlock.so
 vendor/lib64/libconfigdb.so
 vendor/lib64/libdsi_netctrl.so
@@ -1211,6 +1288,7 @@ vendor/lib64/libnetmgr_common.so
 vendor/lib64/libnetmgr_nr_fusion.so
 vendor/lib64/libnetmgr_rmnet_ext.so
 vendor/lib64/libnlnetmgr.so
+vendor/lib64/libparam_vendor.so
 vendor/lib64/libpdmapper.so
 vendor/lib64/libpdnotifier.so
 vendor/lib64/libqcmaputils.so
@@ -1226,6 +1304,7 @@ vendor/lib64/librilqmiservices.so
 vendor/lib64/libsettings.so
 vendor/lib64/libsystem_health_mon.so
 vendor/lib64/qcrild_librilutils.so
+vendor/lib64/vendor.oneplus.hardware.param@1.0.so
 vendor/lib64/vendor.qti.hardware.data.connection@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
@@ -1327,9 +1406,15 @@ vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so
 vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so
 vendor/lib64/vendor.qti.imsrtpservice@1.0.so
 
+# RPM
+vendor/bin/hw/vendor.oneplus.hardware.rpmb@1.0-service
+vendor/etc/init/vendor.oneplus.hardware.rpmb@1.0-service.rc
+vendor/lib64/vendor.oneplus.hardware.rpmb@1.0.so
+
 # Sensors
 vendor/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service
 vendor/bin/sensors.qti
+vendor/bin/sscrpcd
 vendor/etc/init/vendor.qti.hardware.sensorscalibrate@1.0-service.rc
 vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml
 vendor/etc/sensors/config/ak991x_0.json
@@ -1399,7 +1484,7 @@ vendor/lib64/libssc_default_listener.so
 vendor/lib64/sensors.ssc.so
 vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so
 
-# Snapdragon Computer Vision Engine Stack
+# Snapdragon Computer Vision Engine
 lib/vendor.qti.hardware.scve.objecttracker@1.0-adapter-helper.so
 lib/vendor.qti.hardware.scve.objecttracker@1.0.so
 lib/vendor.qti.hardware.scve.panorama@1.0-adapter-helper.so
@@ -1414,6 +1499,7 @@ vendor/etc/init/vendor.qti.hardware.scve.objecttracker@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.scve.panorama@1.0-service.rc
 vendor/lib/hw/vendor.qti.hardware.scve.objecttracker@1.0-impl.so
 vendor/lib/hw/vendor.qti.hardware.scve.panorama@1.0-impl.so
+vendor/lib/libfastcvdsp_stub.so
 vendor/lib/libfastcvopt.so
 vendor/lib/libscveBlobDescriptor.so
 vendor/lib/libscveCommon.so
@@ -1427,6 +1513,7 @@ vendor/lib/vendor.qti.hardware.scve.panorama@1.0-halimpl.so
 vendor/lib/vendor.qti.hardware.scve.panorama@1.0.so
 vendor/lib64/hw/vendor.qti.hardware.scve.objecttracker@1.0-impl.so
 vendor/lib64/hw/vendor.qti.hardware.scve.panorama@1.0-impl.so
+vendor/lib64/libfastcvdsp_stub.so
 vendor/lib64/libfastcvopt.so
 vendor/lib64/libscveBlobDescriptor.so
 vendor/lib64/libscveCommon.so
@@ -1446,6 +1533,10 @@ vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.soter@1.0.so
 
+# SSR
+vendor/bin/ssr_setup
+vendor/bin/subsystem_ramdump
+
 # Thermal
 vendor/bin/thermal-engine
 vendor/etc/thermal-engine.conf
@@ -1558,8 +1649,9 @@ vendor/firmware/shuntai24k_rtp.bin
 vendor/firmware/wentai24k_rtp.bin
 
 # WiFi
-vendor/bin/cnss-daemon
 vendor/bin/hw/vendor.oneplus.hardware.wifi@1.0-service
+vendor/bin/cnss-daemon
+vendor/bin/wifilearner
 vendor/etc/init/vendor.oneplus.hardware.wifi@1.0-service.rc
 vendor/etc/wifi/fstman.ini
 vendor/etc/wifi/icm.conf
@@ -1602,254 +1694,14 @@ lib64/libwfdclient.so
 lib64/libwfdnative.so
 -priv-app/WfdService/WfdService.apk
 vendor/bin/wifidisplayhalservice
+vendor/etc/ArmHDCP_QTI_Android.cfg
 vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
 vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so
 vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
+vendor/lib/libDxHdcp.so
 vendor/lib/libwfdcommonutils_proprietary.so
 vendor/lib/libwfdhaldsmanager.so
 vendor/lib/libwfdhdcpcp.so
 vendor/lib/libwfdmmservice_proprietary.so
 vendor/lib/libwfdmodulehdcpsession.so
-
-# __ sort×clean me __
-vendor/bin/iwlist
-vendor/bin/diag_uart_log
-vendor/bin/hal_proxy_daemon
-vendor/bin/spdaemon
-vendor/bin/sarproxymgr
-vendor/bin/diag_mdlog
-vendor/bin/tcpdump
-vendor/bin/dump_sniffer.sh
-vendor/bin/qca6234-service.sh
-vendor/bin/mm-vidc-omx-test
-vendor/bin/terminate_sniffer.sh
-vendor/bin/mm-audio-ftm
-vendor/bin/diag_callback_sample
-vendor/bin/sscrpcd
-vendor/bin/btnvtool
-vendor/bin/sec_nvm
-vendor/bin/pktlogconf
-vendor/bin/oem-system-daemon
-vendor/bin/hdcp1prov
-vendor/bin/subsystem_ramdump
-vendor/bin/xtwifi-inet-agent
-vendor/bin/myftm
-vendor/bin/climax
-vendor/bin/secure_ui_sample_client
-vendor/bin/wdsdaemon
-vendor/bin/ks
-vendor/bin/qdcmss
-vendor/bin/fmconfig
-vendor/bin/fmfactorytest
-vendor/bin/iwpriv
-vendor/bin/mdm_helper
-vendor/bin/diag_klog
-vendor/bin/cnss_diag
-vendor/bin/mlid
-vendor/bin/OPNetlinkService
-vendor/bin/athdiag
-vendor/bin/factory
-vendor/bin/stoppktlog
-vendor/bin/ssr_diag
-vendor/bin/wifilearner
-vendor/bin/hw/vendor.oneplus.hardware.ifaa@2.0-service
-vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service
-vendor/bin/hw/vendor.oneplus.hardware.rpmb@1.0-service
-vendor/bin/hw/vendor.oneplus.hardware.motorcontrol@1.0-service
-vendor/bin/hw/vendor.oneplus.hardware.display@1.0-service
-vendor/bin/hw/vendor.oneplus.hardware.param@1.0-service
-vendor/bin/hw/vendor.oneplus.faceunlock.hal@1.0-service
-vendor/bin/hw/vendor.qti.hardware.seccam@1.0-service-qti
-vendor/bin/hw/vendor.oneplus.hardware.hdcpkey@1.0-service
-vendor/bin/hw/vendor.oneplus.engnative.engineer@1.0-service
-vendor/bin/hw/vendor.qti.hardware.factory@1.0-service
-vendor/bin/hw/vendor.oneplus.hardware.drmkey@1.0-service
-vendor/bin/StoreKeybox
-vendor/bin/qmi-framework-tests/qmi_test_mt_client_init_instance
-vendor/bin/PktRspTest
-vendor/bin/ssr_setup
-vendor/bin/spectraltool
-vendor/bin/mdm_helper_proxy
-vendor/bin/adpl
-vendor/bin/fstman
-vendor/bin/sigma_dut
-vendor/bin/ppd
-vendor/bin/diag_dci_sample
-vendor/bin/fmfactorytestserver
-vendor/bin/load_wlan_driver.sh
-vendor/bin/qmi_simple_ril_test
-vendor/bin/power_off_alarm
-vendor/bin/KmInstallKeybox
-vendor/bin/qseecom_sample_client
-vendor/bin/launch_sniffer.sh
-vendor/bin/vl53l1_daemon_main
-vendor/bin/hdcp2p2prov
-vendor/bin/iw
-vendor/bin/wifi_diag
-vendor/bin/test_diag
-vendor/bin/cplay
-vendor/bin/mmid
-vendor/bin/e_loop
-vendor/bin/xtwifi-client
-vendor/bin/npu_launcher
-vendor/bin/audioflacapp
-vendor/bin/wifi_ftm
-vendor/bin/vppservice
--vendor/app/Rftoolkit/Rftoolkit.apk
-vendor/app/Rftoolkit/lib/arm64/librftoolkit.so
-vendor/app/Rftoolkit/lib/arm64/liboddi.so
-vendor/etc/ftm_test_config
-vendor/etc/dolby/dax-default.xml
-vendor/etc/18857_ftm.conf
-vendor/etc/fstab_nodata.qcom
-vendor/etc/init/qdcmss.rc
-vendor/etc/init/vendor.oneplus.hardware.display@1.0-service.rc
-vendor/etc/init/vendor.oneplus.faceunlock.hal@1.0-service.rc
-vendor/etc/init/vendor.oneplus.hardware.hdcpkey@1.0-service.rc
-vendor/etc/init/manifest_sku.rc
-vendor/etc/init/vendor.oneplus.hardware.motorcontrol@1.0-service.rc
-vendor/etc/init/init.qti.fm.rc
-vendor/etc/init/vendor.oneplus.hardware.ifaa@2.0-service.rc
-vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc
-vendor/etc/init/vendor.oneplus.hardware.drmkey@1.0-service.rc
-vendor/etc/init/vendor.oneplus.hardware.rpmb@1.0-service.rc
-vendor/etc/init/vendor.qti.hardware.seccam@1.0-service-qti.rc
-vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc
-vendor/etc/init/vendor.oneplus.hardware.param@1.0-service.rc
-vendor/etc/18825_ftm.conf
-vendor/etc/media_codecs_dolby_audio.xml
-vendor/etc/selinux/sepolicy_debug
-vendor/etc/system_properties.xml
-vendor/etc/permissions/vendor.qti.hardware.factory.xml
-vendor/etc/permissions/android.software.device_id_attestation.xml
-vendor/etc/sdr_config.cfg
-vendor/etc/ftm_test_config_qrd
-vendor/etc/oneplus_ftm_test_max.wav
-vendor/etc/oneplus_ftm_test_nxp.wav
-vendor/etc/gpfspath_oem_config.xml
-vendor/etc/18821_ftm.conf
-vendor/etc/vpp/tunings.txt
-vendor/etc/oneplus_ftm_test_dulspk.wav
-vendor/etc/18827_ftm.conf
-vendor/etc/hdr_config.cfg
-vendor/etc/18831_ftm.conf
-vendor/etc/ftm_test.png
-vendor/etc/ArmHDCP_QTI_Android.cfg
-vendor/lib/vendor.qti.hardware.alarm@1.0.so
-vendor/lib/libwapi_cert.so
-vendor/lib/libbt-vendor.so
-vendor/lib/vendor.dolby.hardware.dms@1.0.so
-vendor/lib/libhdcp2p2prov.so
-vendor/lib/libcvp_common.so
-vendor/lib/libDxHdcp.so
-vendor/lib/liblistenjni.so
-vendor/lib/libsubsystem_control.so
-vendor/lib/libdiagjni.so
-vendor/lib/libqcbor.so
-vendor/lib/libvl53l1_daemon.so
-vendor/lib/libvpphcp.so
-vendor/lib/libparam_vendor.so
-vendor/lib/libqsap_sdk.so
-vendor/lib/libsysmon_cdsp_skel.so
-vendor/lib/libvppimmotion.so
-vendor/lib/libfastcvdsp_stub.so
-vendor/lib/libnpu.so
-vendor/lib/vendor.qti.hardware.factory@1.0.so
-vendor/lib/vendor.qti.hardware.cvp@1.0.so
-vendor/lib/libfastcrc.so
-vendor/lib/libcvp_stub.so
-vendor/lib/libspcom.so
-vendor/lib/libhdrdynamic.so
-vendor/lib/libops.so
-vendor/lib/libdapparamstorage.so
-vendor/lib/libpvr.so
-vendor/lib/hw/vendor.qti.hardware.alarm@1.0-impl.so
-vendor/lib/hw/vendor.qti.hardware.factory@1.0-impl.so
-vendor/lib/hw/awinic.haptic.effect.so
-vendor/lib/hw/com.qualcomm.qti.bluetooth_audio@1.0-impl.so
-vendor/lib/com.qualcomm.qti.dpm.api@1.0.so
-vendor/lib/vendor.qti.hardware.seccam@1.0.so
-vendor/lib/libcvp.so
-vendor/lib/libsi.so
-vendor/lib/libSubSystemShutdown.so
-vendor/lib/liboemaids_vendor.so
-vendor/lib/vendor.qti.hardware.wigig.netperftuner@1.0.so
-vendor/lib/libcert_parse.wpa_s.so
-vendor/lib/libmulawdec.so
-vendor/lib/com.qualcomm.qti.bluetooth_audio@1.0.so
-vendor/lib/libdpmqmihal.so
-vendor/lib/libspl.so
-vendor/lib/libcvpcpuRev_skel.so
-vendor/lib/librecovery_updater_msm.so
-vendor/lib/libhdcp1prov.so
-vendor/lib/libhdrdynamicootf.so
-vendor/lib/libstreamparser.so
-vendor/lib/vendor.qti.voiceprint@1.0.so
-vendor/lib/vendor.oneplus.hardware.param@1.0.so
-vendor/lib64/libhvx_proxy_stub.so
-vendor/lib64/libreffeature.so
-vendor/lib64/vendor.oneplus.hardware.motorcontrol@1.0.so
-vendor/lib64/libwapi_cert.so
-vendor/lib64/libbt-vendor.so
-vendor/lib64/vendor.dolby.hardware.dms@1.0.so
-vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so
-vendor/lib64/libhdcp2p2prov.so
-vendor/lib64/libmdmimgload.so
-vendor/lib64/vendor.oneplus.hardware.ifaa@2.0.so
-vendor/lib64/libcvp_common.so
-vendor/lib64/vendor.qti.hardware.mlshal@1.0-halimpl.so
 vendor/lib64/libDxHdcp.so
-vendor/lib64/ls_client.so
-vendor/lib64/liblistenjni.so
-vendor/lib64/libsubsystem_control.so
-vendor/lib64/vendor.oneplus.hardware.drmkey@1.0.so
-vendor/lib64/libdlbdsservice.so
-vendor/lib64/libdiagjni.so
-vendor/lib64/libqcbor.so
-vendor/lib64/libvl53l1_daemon.so
-vendor/lib64/libvpphcp.so
-vendor/lib64/vendor.oneplus.faceunlock.hal@1.0.so
-vendor/lib64/libparam_vendor.so
-vendor/lib64/libqsap_sdk.so
-vendor/lib64/libminui_vendor.so
-vendor/lib64/libgrallocutils.so
-vendor/lib64/libsysmon_cdsp_skel.so
-vendor/lib64/libvppimmotion.so
-vendor/lib64/libfastcvdsp_stub.so
-vendor/lib64/libnpu.so
-vendor/lib64/libnanopb.so
-vendor/lib64/vendor.qti.hardware.factory@1.0.so
-vendor/lib64/vendor.oneplus.hardware.rpmb@1.0.so
-vendor/lib64/vendor.qti.hardware.cvp@1.0.so
-vendor/lib64/libcvp_stub.so
-vendor/lib64/libspcom.so
-vendor/lib64/libhdrdynamic.so
-vendor/lib64/libops.so
-vendor/lib64/libdapparamstorage.so
-vendor/lib64/liboddi.so
-vendor/lib64/libpvr.so
-vendor/lib64/hw/vendor.qti.hardware.mlshal@1.0-impl.so
-vendor/lib64/hw/vendor.qti.hardware.factory@1.0-impl.so
-vendor/lib64/hw/com.qualcomm.qti.bluetooth_audio@1.0-impl.so
-vendor/lib64/vendor.qti.hardware.mlshal@1.0.so
-vendor/lib64/libtinycompress.so
-vendor/lib64/vendor.qti.hardware.seccam@1.0.so
-vendor/lib64/libcvp.so
-vendor/lib64/libarm_proxy_skel.so
-vendor/lib64/libsi.so
-vendor/lib64/libSubSystemShutdown.so
-vendor/lib64/liboemaids_vendor.so
-vendor/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
-vendor/lib64/libcert_parse.wpa_s.so
-vendor/lib64/libmulawdec.so
-vendor/lib64/vendor.oneplus.engnative.engineer@1.0.so
-vendor/lib64/com.qualcomm.qti.bluetooth_audio@1.0.so
-vendor/lib64/libspl.so
-vendor/lib64/libcvpcpuRev_skel.so
-vendor/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so
-vendor/lib64/librecovery_updater_msm.so
-vendor/lib64/libhdcp1prov.so
-vendor/lib64/libhdrdynamicootf.so
-vendor/lib64/libminui.so
-vendor/lib64/vendor.qti.voiceprint@1.0.so
-vendor/lib64/vendor.oneplus.hardware.param@1.0.so
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index ba1599e4..19dc9f4a 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -31,6 +31,7 @@ on early-init
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules audio_wglink audio_q6_pdr audio_q6_notifier audio_apr audio_adsp_loader audio_q6 audio_native audio_usf audio_pinctrl_wcd audio_swr audio_platform audio_hdmi audio_wcd_spi audio_stub audio_wcd_core audio_wsa881x audio_tfa9894 audio_wcd9360 audio_hdmi audio_machine_msmnile
     write /proc/sys/kernel/sched_boost 1
     symlink /data/tombstones /tombstones
+    start vendor.manifest-sku
 
 on init
     # permission for dt2w
@@ -362,6 +363,12 @@ on property:ro.boot.baseband=mdm
 on property:persist.vendor.oem.fp.version=6
     start qfp-daemon
 
+service vendor.manifest-sku /vendor/bin/init.qti.manifest_sku.sh
+    user root
+    group root
+    oneshot
+    seclabel u:r:vendor_init:s0
+
 #ifdef VENDOR_EDIT
 on shutdown
     rm /data/vendor/oemnvitems/4678_0