marble: reorder proprietary-files.txt

proprietary-files.txt

@@ -136,16 +136,16 @@ vendor/lib/hw/audio.usb.default.so
 vendor/lib/hw/gyro_fusion_interface.so
 vendor/lib/libadm.so
 vendor/lib/libaudio_log_utils.so
+vendor/lib/libaudiocloudctrl.so
+vendor/lib/libaudioroute_ext.so
 vendor/lib/libcapiv2svacnnvendor.so
 vendor/lib/libcapiv2svarnnvendor.so
 vendor/lib/libcapiv2uvvendor.so
 vendor/lib/libdsd2pcm.so
 vendor/lib/libeai_fixed_32.so
 vendor/lib/libfastcrc.so
-vendor/lib/libqtigefar.so;DISABLE_CHECKELF
-vendor/lib/libaudiocloudctrl.so
-vendor/lib/libaudioroute_ext.so
 vendor/lib/libjson.so
+vendor/lib/libqtigefar.so;DISABLE_CHECKELF
 vendor/lib/libresampler.so
 vendor/lib/libultrasound_notify.so
 vendor/lib/libxlog.so
@@ -155,6 +155,8 @@ vendor/lib64/hw/audio.usb.default.so
 vendor/lib64/hw/gyro_fusion_interface.so
 vendor/lib64/libadm.so
 vendor/lib64/libaudio_log_utils.so
+vendor/lib64/libaudiocloudctrl.so
+vendor/lib64/libaudioroute_ext.so
 vendor/lib64/libcapiv2svacnnvendor.so
 vendor/lib64/libcapiv2svarnnvendor.so
 vendor/lib64/libcapiv2uvvendor.so
@@ -162,10 +164,8 @@ vendor/lib64/libdsd2pcm.so
 vendor/lib64/libeai_fixed.so
 vendor/lib64/libeai_float.so
 vendor/lib64/libfastcrc.so
-vendor/lib64/libqtigefar.so;DISABLE_CHECKELF
-vendor/lib64/libaudiocloudctrl.so
-vendor/lib64/libaudioroute_ext.so
 vendor/lib64/libjson.so
+vendor/lib64/libqtigefar.so;DISABLE_CHECKELF
 vendor/lib64/libresampler.so
 vendor/lib64/libultrasound_notify.so
 vendor/lib64/libxlog.so
@@ -192,25 +192,27 @@ vendor/lib64/soundfx/libswvqe.so
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
 vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
-vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
 vendor/lib/lib_bt_lhdc.so;DISABLE_CHECKELF
-vendor/lib64/lib_bt_lhdc.so;DISABLE_CHECKELF
 vendor/lib/libbtnv.so
-vendor/lib64/libbtnv.so
 vendor/lib/libqti_vndfwk_detect_vendor.so
 vendor/lib/libsoc_helper.so
+vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
+vendor/lib64/lib_bt_lhdc.so;DISABLE_CHECKELF
+vendor/lib64/libbtnv.so
 vendor/lib64/libqti_vndfwk_detect_vendor.so
 vendor/lib64/libsoc_helper.so
 
 # Bluetooth (A2DP)
-vendor/lib/btaudio_offload_if.so
-vendor/lib64/btaudio_offload_if.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-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/com.qualcomm.qti.bluetooth_audio@1.0.so
+vendor/lib/libbluetooth_audio_session_qti.so
+vendor/lib/libbluetooth_audio_session_qti_2_1.so
+vendor/lib/libbt-hidlclient.so
 vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so
 vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
@@ -218,15 +220,13 @@ vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
 vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so
 vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
 vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
+vendor/lib64/btaudio_offload_if.so
 vendor/lib64/com.qualcomm.qti.bluetooth_audio@1.0.so
-vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
-vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
-vendor/lib/libbluetooth_audio_session_qti.so
-vendor/lib/libbluetooth_audio_session_qti_2_1.so
 vendor/lib64/libbluetooth_audio_session_qti.so
 vendor/lib64/libbluetooth_audio_session_qti_2_1.so
-vendor/lib/libbt-hidlclient.so
 vendor/lib64/libbt-hidlclient.so
+vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
+vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
 
 # Camera
 system_ext/lib/vendor.qti.hardware.seccam@1.0.so
@@ -1004,11 +1004,11 @@ vendor/lib/libcdfw.so
 vendor/lib/libcdfw_remote_api.so
 vendor/lib/libcdsp_default_listener.so
 vendor/lib/libcdsprpc.so
+vendor/lib/libfastcvdsp_stub.so
+vendor/lib/libfastcvopt.so
 vendor/lib/libmdsprpc.so
 vendor/lib/libsdsprpc.so
 vendor/lib/libsysmon_cdsp_skel.so
-vendor/lib/libfastcvdsp_stub.so
-vendor/lib/libfastcvopt.so
 vendor/lib64/libcdfw.so
 vendor/lib64/libcdfw_remote_api.so
 vendor/lib64/libcdsp_default_listener.so
@@ -1036,8 +1036,6 @@ vendor/etc/charger_fw_fstab.qti
 vendor/app/CACertService/CACertService.apk
 vendor/app/CneApp/CneApp.apk;REQUIRED=CneApp.libvndfwk_detect_jni.qti_vendor_symlink
 vendor/bin/cnd
-vendor/etc/cne/mwqem.conf
-vendor/etc/cne/profileMwqem.xml
 vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml
 vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml
 vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml
@@ -1067,6 +1065,8 @@ 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/wqeclient/VZW/VZW_profile7.xml
+vendor/etc/cne/mwqem.conf
+vendor/etc/cne/profileMwqem.xml
 vendor/etc/default-permissions/com.qualcomm.qti.cne.xml
 vendor/etc/init/cnd.rc
 vendor/etc/vintf/manifest/dataconnection-saidl.xml
@@ -1227,8 +1227,8 @@ vendor/lib64/libqdp.so
 
 # Diag
 system/lib/vendor.qti.diaghal-V1-ndk.so
-system_ext/lib/vendor.qti.diaghal@1.0.so
 system/lib64/vendor.qti.diaghal-V1-ndk.so
+system_ext/lib/vendor.qti.diaghal@1.0.so
 system_ext/lib64/vendor.qti.diaghal@1.0.so
 vendor/bin/diag-router
 vendor/etc/init/vendor.qti.diag.rc
@@ -1284,9 +1284,9 @@ vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so
 
 # Display (SDM)
 vendor/lib/libbacklight-calib.so
-vendor/lib/libdigital-dimming.so
 vendor/lib/libclient2slpi.notifier.so
 vendor/lib/libcolortempmode.so
+vendor/lib/libdigital-dimming.so
 vendor/lib/libdisplaycount.so
 vendor/lib/libdisplaydebug.so
 vendor/lib/libdisplayqos.so
@@ -1308,9 +1308,9 @@ vendor/lib/libtinyxml2_1.so
 vendor/lib/libtruetone.so
 vendor/lib/libvideomode.so
 vendor/lib64/libbacklight-calib.so
-vendor/lib64/libdigital-dimming.so
 vendor/lib64/libclient2slpi.notifier.so
 vendor/lib64/libcolortempmode.so
+vendor/lib64/libdigital-dimming.so
 vendor/lib64/libdisplaycount.so
 vendor/lib64/libdisplaydebug.so
 vendor/lib64/libdisplayqos.so
@@ -1333,13 +1333,14 @@ vendor/lib64/libtruetone.so
 vendor/lib64/libvideomode.so
 
 # Display (Xiaomi)
+odm/lib/libhdrmode.so
+odm/lib64/libhdrmode.so
 vendor/lib/libMiDispDevManager.so
 vendor/lib/libmi-stc-HW-modulate.so
 vendor/lib/libmiBrightness.so
 vendor/lib/libmiSensorCtrl.so
 vendor/lib/libmiXmlParser.so
 vendor/lib/libmi_dspp.so
-odm/lib/libhdrmode.so
 vendor/lib/vendor.xiaomi.sensor.citsensorservice@1.1.so
 vendor/lib/vendor.xiaomi.sensor.citsensorservice@2.0.so
 vendor/lib64/libMiDispDevManager.so
@@ -1350,7 +1351,6 @@ vendor/lib64/libmiXmlParser.so
 vendor/lib64/libmi_dspp.so
 vendor/lib64/vendor.xiaomi.sensor.citsensorservice@1.1.so
 vendor/lib64/vendor.xiaomi.sensor.citsensorservice@2.0.so
-odm/lib64/libhdrmode.so
 
 # Display (Misc)
 vendor/lib/libdither.so
@@ -1614,22 +1614,22 @@ vendor/firmware/goodix_test_limits_255_TM.csv
 vendor/firmware/goodix_test_limits_255_TM_Second.csv
 
 # FM
-vendor/etc/init.qti.fm.sh
 vendor/etc/init/init.qti.fm.rc
-vendor/lib/ftm_fm_lib.so
+vendor/etc/init.qti.fm.sh
 vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so
+vendor/lib/ftm_fm_lib.so
 vendor/lib/vendor.qti.hardware.fm@1.0.so
-vendor/lib64/ftm_fm_lib.so
 vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
+vendor/lib64/ftm_fm_lib.so
 vendor/lib64/vendor.qti.hardware.fm@1.0.so
 
 # Graphics (Adreno)
-vendor/lib/egl/eglSubDriverAndroid.so
 vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so
-vendor/lib/egl/libGLESv1_CM_adreno.so
 vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so
-vendor/lib/egl/libVkLayer_ADRENO_qprofiler.so
 vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so
+vendor/lib/egl/eglSubDriverAndroid.so
+vendor/lib/egl/libGLESv1_CM_adreno.so
+vendor/lib/egl/libVkLayer_ADRENO_qprofiler.so
 vendor/lib/egl/libq3dtools_esx.so
 vendor/lib/libCB.so
 vendor/lib/libadreno_app_profiles.so
@@ -1641,12 +1641,12 @@ vendor/lib/libkernelmanager.so
 vendor/lib/libllvm-glnext.so
 vendor/lib/libllvm-qcom.so
 vendor/lib/libllvm-qgl.so
-vendor/lib64/egl/eglSubDriverAndroid.so
 vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so
-vendor/lib64/egl/libGLESv1_CM_adreno.so
 vendor/lib64/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib64/libGLESv2_adreno.so
-vendor/lib64/egl/libVkLayer_ADRENO_qprofiler.so
 vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.so
+vendor/lib64/egl/eglSubDriverAndroid.so
+vendor/lib64/egl/libGLESv1_CM_adreno.so
+vendor/lib64/egl/libVkLayer_ADRENO_qprofiler.so
 vendor/lib64/egl/libq3dtools_esx.so
 vendor/lib64/libCB.so
 vendor/lib64/libadreno_app_profiles.so
@@ -1697,10 +1697,10 @@ vendor/gpu/kbc/unified_ksqs.bin
 vendor/lib64/hw/vulkan.adreno.so
 
 # GNSS
+vendor/bin/hw/android.hardware.gnss-aidl-service-qti
 vendor/bin/edgnss-daemon
 vendor/bin/engine-service
 vendor/bin/garden_app
-vendor/bin/hw/android.hardware.gnss-aidl-service-qti
 vendor/bin/loc_launcher
 vendor/bin/lowi-server;DISABLE_CHECKELF
 vendor/bin/mlid
@@ -1709,21 +1709,21 @@ vendor/bin/slim_daemon
 vendor/bin/xtra-daemon
 vendor/bin/xtwifi-client
 vendor/bin/xtwifi-inet-agent
-vendor/etc/apdr.conf
-vendor/etc/batching.conf
 vendor/etc/init/android.hardware.gnss-aidl-service-qti.rc
 vendor/etc/init/init.qdmastats.rc
 vendor/etc/init/loc-launcher.rc
-vendor/etc/izat.conf
-vendor/etc/lowi.conf
-vendor/etc/sap.conf
-vendor/etc/sec_config
 vendor/etc/seccomp_policy/gnss@2.0-base.policy
 vendor/etc/seccomp_policy/gnss@2.0-xtra-daemon.policy
 vendor/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy
 vendor/etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml
 vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
 vendor/etc/vintf/manifest/vendor.qti.gnss-service.xml
+vendor/etc/apdr.conf
+vendor/etc/batching.conf
+vendor/etc/izat.conf
+vendor/etc/lowi.conf
+vendor/etc/sap.conf
+vendor/etc/sec_config
 vendor/etc/xtwifi.conf
 vendor/lib/hw/android.hardware.gnss-aidl-impl-qti.so
 vendor/lib/hw/android.hardware.gnss@2.1-impl-qti.so
@@ -1880,23 +1880,23 @@ system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar
 system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar
 system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar
 system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar
+system_ext/lib/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm/libimscamera_jni.so
+system_ext/lib/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm/libimsmedia_jni.so
 system_ext/lib/lib-imsvideocodec.so
 system_ext/lib/lib-imsvt.so
 system_ext/lib/lib-imsvtextutils.so
 system_ext/lib/lib-imsvtutils.so
 system_ext/lib/libdiag_system.so
-system_ext/lib/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm/libimscamera_jni.so
-system_ext/lib/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm/libimsmedia_jni.so
 system_ext/lib/vendor.qti.ImsRtpService-V1-ndk.so
 system_ext/lib/vendor.qti.imsrtpservice@3.0.so
 system_ext/lib/vendor.qti.imsrtpservice@3.1.so
+system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so
+system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so
 system_ext/lib64/lib-imsvideocodec.so
 system_ext/lib64/lib-imsvt.so
 system_ext/lib64/lib-imsvtextutils.so
 system_ext/lib64/lib-imsvtutils.so
 system_ext/lib64/libdiag_system.so
-system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so
-system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so
 system_ext/lib64/vendor.qti.ImsRtpService-V1-ndk.so
 system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
 system_ext/lib64/vendor.qti.imsrtpservice@3.1.so
@@ -2056,14 +2056,14 @@ vendor/lib/hw/local_time.default.so
 vendor/lib64/hw/local_time.default.so
 
 # Media
-system_ext/lib/vendor.qti.hardware.qconfig-V3-ndk.so
-system_ext/lib/vendor.qti.hardware.vpp-V1-ndk.so
-system_ext/lib64/vendor.qti.hardware.qconfig-V3-ndk.so
-system_ext/lib64/vendor.qti.hardware.vpp-V1-ndk.so
 system_ext/lib/libmmosal.so
 system_ext/lib/libmmparser_lite.so
+system_ext/lib/vendor.qti.hardware.qconfig-V3-ndk.so
+system_ext/lib/vendor.qti.hardware.vpp-V1-ndk.so
 system_ext/lib64/libmmosal.so
 system_ext/lib64/libmmparser_lite.so
+system_ext/lib64/vendor.qti.hardware.qconfig-V3-ndk.so
+system_ext/lib64/vendor.qti.hardware.vpp-V1-ndk.so
 vendor/bin/hw/vendor.qti.media.c2@1.0-service
 vendor/bin/hw/vendor.qti.media.c2audio@1.0-service
 vendor/bin/init.qti.media.sh
@@ -2071,6 +2071,10 @@ vendor/etc/init/init.qti.media.rc
 vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
 vendor/etc/init/vendor.qti.media.c2audio@1.0-service.rc
 vendor/etc/media_cape/video_system_specs.json
+vendor/etc/seccomp_policy/codec2.vendor.base-arm64.policy
+vendor/etc/seccomp_policy/codec2.vendor.ext-arm64.policy
+vendor/etc/vintf/manifest/c2_manifest_vendor.xml
+vendor/etc/vintf/manifest/c2_manifest_vendor_audio.xml
 vendor/etc/media_codecs_c2_audio.xml
 vendor/etc/media_codecs_cape.xml
 vendor/etc/media_codecs_performance_cape.xml
@@ -2078,18 +2082,10 @@ vendor/etc/media_codecs_performance_cape_vendor.xml
 vendor/etc/media_profiles.xml
 vendor/etc/media_profiles_V1_0.xml
 vendor/etc/media_profiles_cape.xml
-vendor/etc/seccomp_policy/codec2.vendor.base-arm64.policy
-vendor/etc/seccomp_policy/codec2.vendor.ext-arm64.policy
-vendor/etc/vintf/manifest/c2_manifest_vendor.xml
-vendor/etc/vintf/manifest/c2_manifest_vendor_audio.xml
 vendor/lib/libOmxCore.so
+vendor/lib/libQcelp13SwCodec.so
 vendor/lib/libmisight.so
 vendor/lib/libplatformconfig.so
-vendor/lib/libstagefright_soft_ac4dec.so
-vendor/lib/libstagefright_soft_ddpdec.so
-vendor/lib/libstagefrightdolby.so
-vendor/lib/libstagefrighthw.so
-vendor/lib/libQcelp13SwCodec.so
 vendor/lib/libqc2audio_base.so
 vendor/lib/libqc2audio_basecodec.so
 vendor/lib/libqc2audio_core.so
@@ -2112,17 +2108,17 @@ vendor/lib/libqcodec2_platform.so
 vendor/lib/libqcodec2_utils.so
 vendor/lib/libqcodec2_v4l2codec.so
 vendor/lib/libqconfigclient.so
+vendor/lib/libstagefright_soft_ac4dec.so
+vendor/lib/libstagefright_soft_ddpdec.so
+vendor/lib/libstagefrightdolby.so
+vendor/lib/libstagefrighthw.so
 vendor/lib/libvideotxr.so
 vendor/lib/libvideoutils.so
 vendor/lib64/libOmxCore.so
-vendor/lib64/libmisight.so
-vendor/lib64/libplatformconfig.so
-vendor/lib64/libstagefright_soft_ac4dec.so
-vendor/lib64/libstagefright_soft_ddpdec.so
-vendor/lib64/libstagefrightdolby.so
-vendor/lib64/libstagefrighthw.so
 vendor/lib64/libQcelp13SwCodec.so
+vendor/lib64/libmisight.so
 vendor/lib64/libmmosal_vendor.so
+vendor/lib64/libplatformconfig.so
 vendor/lib64/libqc2audio_base.so
 vendor/lib64/libqc2audio_basecodec.so
 vendor/lib64/libqc2audio_core.so
@@ -2145,6 +2141,10 @@ vendor/lib64/libqcodec2_platform.so
 vendor/lib64/libqcodec2_utils.so
 vendor/lib64/libqcodec2_v4l2codec.so
 vendor/lib64/libqconfigclient.so
+vendor/lib64/libstagefright_soft_ac4dec.so
+vendor/lib64/libstagefright_soft_ddpdec.so
+vendor/lib64/libstagefrightdolby.so
+vendor/lib64/libstagefrighthw.so
 vendor/lib64/libvideotxr.so
 vendor/lib64/libvideoutils.so
 
@@ -2437,12 +2437,12 @@ vendor/bin/init.qti.qcv.sh
 vendor/etc/init/init.qti.qcv.rc
 
 # QESD
-vendor/etc/seccomp_policy/qesdk.policy
-vendor/etc/seccomp_policy/sensors-qesdk.policy
 vendor/bin/perf_qesdk_client
 vendor/bin/qesdk-manager
 vendor/bin/sensors-qesdk
 vendor/etc/init/qesdk-manager.rc
+vendor/etc/seccomp_policy/qesdk.policy
+vendor/etc/seccomp_policy/sensors-qesdk.policy
 vendor/lib/libqesdk.so
 vendor/lib/libqesdk_manager.so
 vendor/lib/vendor.qti.qesdsys-V1-ndk_platform.so
@@ -2532,12 +2532,10 @@ vendor/bin/irsc_util
 vendor/bin/qdss_qmi_helper
 vendor/bin/qmipriod
 vendor/etc/init/qmipriod.rc
-vendor/etc/sec_config
 vendor/etc/seccomp_policy/qti-systemd.policy
+vendor/etc/sec_config
 vendor/lib/libdsi_netctrl.so
-vendor/lib64/libdsi_netctrl.so
 vendor/lib/libdsutils.so
-vendor/lib64/libdsutils.so
 vendor/lib/libidl.so
 vendor/lib/libqcci_legacy.so
 vendor/lib/libqmi.so
@@ -2552,6 +2550,8 @@ vendor/lib/libqmi_legacy.so
 vendor/lib/libqmiextservices.so
 vendor/lib/libqmiservices.so
 vendor/lib/libsmemlog.so
+vendor/lib64/libdsi_netctrl.so
+vendor/lib64/libdsutils.so
 vendor/lib64/libidl.so
 vendor/lib64/libqcci_legacy.so
 vendor/lib64/libqmi.so
@@ -2570,11 +2570,10 @@ vendor/lib64/libsmemlog.so
 # QSEECOM
 vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
 vendor/bin/qseecomd
-vendor/etc/gpfspath_oem_config.xml
 vendor/etc/init/qseecomd.rc
 vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc
+vendor/etc/gpfspath_oem_config.xml
 vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so
-vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
 vendor/lib/libGPreqcancel.so
 vendor/lib/libGPreqcancel_svc.so
 vendor/lib/libQSEEComAPI.so
@@ -2587,6 +2586,7 @@ vendor/lib/libspl.so
 vendor/lib/libssd.so
 vendor/lib/libtzdrmgenprov.so
 vendor/lib/vendor.qti.hardware.qseecom@1.0.so
+vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
 vendor/lib64/libGPreqcancel.so
 vendor/lib64/libGPreqcancel_svc.so
 vendor/lib64/libQSEEComAPI.so
@@ -2662,8 +2662,8 @@ vendor/etc/qcril_database/qcrilNr.db
 vendor/etc/seccomp_policy/modemManager.policy
 vendor/etc/seccomp_policy/qcrilnr@2.0.policy
 vendor/etc/ssg/tz_whitelist.json
-vendor/etc/telephony_packages.xml
 vendor/etc/vintf/manifest/qtiradio-saidl.xml
+vendor/etc/telephony_packages.xml
 vendor/lib/libQtiRilLoadable.so
 vendor/lib/liblqe.so
 vendor/lib/libmdmdetect.so
@@ -2981,12 +2981,12 @@ vendor/lib64/libtime_genoff.so
 vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service
 vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc
 vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
-vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
 vendor/lib/libGPQTEEC_vendor.so
 vendor/lib/libGPTEE_vendor.so
 vendor/lib/libQTEEConnector_listener.so
 vendor/lib/libQTEEConnector_vendor.so
 vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so
+vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
 vendor/lib64/libGPQTEEC_vendor.so
 vendor/lib64/libGPTEE_vendor.so
 vendor/lib64/libQTEEConnector_listener.so
@@ -3273,11 +3273,11 @@ vendor/firmware/vpu20_4v.mdt
 vendor/bin/hw/android.hardware.drm@1.4-service.widevine
 vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
 vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
-vendor/lib/libtrustedapploader.so
 vendor/lib/mediadrm/libwvdrmengine.so
+vendor/lib/libtrustedapploader.so
+vendor/lib64/mediadrm/libwvdrmengine.so
 vendor/lib64/libtrustedapploader.so
 vendor/lib64/libwvhidl.so
-vendor/lib64/mediadrm/libwvdrmengine.so
 
 # WiFi
 vendor/bin/cnss-daemon
@@ -3323,6 +3323,7 @@ system_ext/lib/libwfduibcsrc.so
 system_ext/lib/libwfduibcsrcinterface.so
 system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
 system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so
+system_ext/lib64/libwfdnative.so;SYMLINK=system_ext/priv-app/WfdService/lib/arm64/libwfdnative.so
 system_ext/lib64/libmmrtpdecoder.so
 system_ext/lib64/libmmrtpencoder.so
 system_ext/lib64/libwfdavenhancements.so
@@ -3333,7 +3334,6 @@ system_ext/lib64/libwfddisplayconfig.so
 system_ext/lib64/libwfdmminterface.so
 system_ext/lib64/libwfdmmsink.so
 system_ext/lib64/libwfdmmsrc_system.so
-system_ext/lib64/libwfdnative.so;SYMLINK=system_ext/priv-app/WfdService/lib/arm64/libwfdnative.so
 system_ext/lib64/libwfdrtsp.so
 system_ext/lib64/libwfdservice.so
 system_ext/lib64/libwfdsinksm.so
@@ -3383,11 +3383,11 @@ vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE_SUFFIX=_vendor
 vendor/lib64/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
 
 # Xiaomi
-vendor/lib/libxiaomi_qcril.so
-vendor/lib64/libxiaomi_qcril.so
 vendor/lib/libMiVDR.so
+vendor/lib/libxiaomi_qcril.so
 vendor/lib64/libMiVDR.so
+vendor/lib64/libxiaomi_qcril.so
 
 # Misc
 vendor/lib/libc++_shared.so
-vendor/lib64/libc++_shared.so
+vendor/lib64/libc++_shared.so