From a53965af70418312a290e7172c4f02ccb41ecc2b Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 20 Nov 2024 23:37:46 -0500
Subject: [PATCH] exynos9610: Combine system and vendor proprietary-files lists

Change-Id: Ie0662357b113f56a63e3b95fec6bd79763d9a0dc
---
 extract-files.sh             |   1 -
 proprietary-files-vendor.txt | 314 -----------------------------------
 proprietary-files.txt        | 309 ++++++++++++++++++++++++++++++++++
 setup-makefiles.sh           |   1 -
 4 files changed, 309 insertions(+), 316 deletions(-)
 delete mode 100644 proprietary-files-vendor.txt

diff --git a/extract-files.sh b/extract-files.sh
index 2dc5139..9d414b3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -135,7 +135,6 @@ if [ -z "${ONLY_FIRMWARE}" ] && [ -z "${ONLY_TARGET}" ]; then
     setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
 
     extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
     # Reinitialize the helper for device
     source "${MY_DIR}/../../${VENDOR}/${DEVICE}/extract-files.sh"
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
deleted file mode 100644
index 892a31e..0000000
--- a/proprietary-files-vendor.txt
+++ /dev/null
@@ -1,314 +0,0 @@
-## Common proprietary files - from motorola/troika_retail/troika_sprout:11/RSBS31.Q1-48-36-20/3e578:user/release-keys, unless pinned
-
-## Camera
-vendor/lib/libENF.so
-vendor/lib/libexynoscamera_hifi_plugin.so
-vendor/lib/libexynoscamera_hifills_plugin.so
-vendor/lib/libexynoscamera_plugin.so
-vendor/lib/libexynoscamera_plugin_utils.so
-vendor/lib/libexynoscamera_vdis_plugin.so
-vendor/lib/libhifills.so
-vendor/lib/libvdis.so
-vendor/lib/libyuvrepro.so
-vendor/lib64/libENF.so
-vendor/lib64/libexynoscamera_hifi_plugin.so
-vendor/lib64/libexynoscamera_hifills_plugin.so
-vendor/lib64/libexynoscamera_plugin.so
-vendor/lib64/libexynoscamera_plugin_utils.so
-vendor/lib64/libexynoscamera_vdis_plugin.so
-vendor/lib64/libhifills.so
-vendor/lib64/libvdis.so
-vendor/lib64/libyuvrepro.so
-
-# Camera - Shims - Built in lineage-21, and prebuilt here.
-vendor/lib/libdemangle.so|d3fc0883a09a0debbf79ddd4bba922e79cb3d9ee
-vendor/lib64/libdemangle.so|ac9a52ac9146d0eceaeaba5e0c47f0d2c14e4428
-
-## Charger
-vendor/bin/charge_only_mode
-
-## DRM
-vendor/lib/liboemcrypto.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/lib/libwvhidl.so
-
-## Fingerprint
-vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-rbs
-vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-rbs.rc
-vendor/lib/hw/vendor.egistec.hardware.fingerprint@4.0-impl.so
-vendor/lib/vendor.egistec.hardware.fingerprint@4.0.so
-vendor/lib64/hw/vendor.egistec.hardware.fingerprint@4.0-impl.so
-vendor/lib64/libRbsFlow.so
-vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so
-
-## Firmware
-vendor/firmware/AP_AUDIO_SLSI.bin
-vendor/firmware/CC_DRAM_CODE_FLASH_HIFI.bin
-vendor/firmware/CC_DTCM_CODE_FLASH_HIFI.bin
-vendor/firmware/CC_ITCM_CODE_FLASH_HIFI.bin
-vendor/firmware/CP_AUDIO_SLSI.bin
-vendor/firmware/WithLightFixNoBN.SDNNmodel
-vendor/firmware/aw8695_haptic.bin
-vendor/firmware/aw8695_rtp.bin
-vendor/firmware/aw8695_rtp_Attentive.bin
-vendor/firmware/aw8695_rtp_Bird_Loop.bin
-vendor/firmware/aw8695_rtp_Crazy_Dream.bin
-vendor/firmware/aw8695_rtp_Curve_Ball_Blend.bin
-vendor/firmware/aw8695_rtp_Ether_Shake.bin
-vendor/firmware/aw8695_rtp_Hello.bin
-vendor/firmware/aw8695_rtp_Momentum.bin
-vendor/firmware/aw8695_rtp_Moto.bin
-vendor/firmware/aw8695_rtp_Natural.bin
-vendor/firmware/aw8695_rtp_Pyxis.bin
-vendor/firmware/aw8695_rtp_Simple.bin
-vendor/firmware/aw8695_rtp_Sparse.bin
-vendor/firmware/bl.unchecked.bin
-vendor/firmware/bu24218_Rev1.5_S_data1.bin
-vendor/firmware/bu24218_Rev1.5_S_data2.bin
-vendor/firmware/bu24218_cal_data_default.bin
-vendor/firmware/calliope_dram.bin
-vendor/firmware/calliope_sram.bin
-vendor/firmware/cs35l41-dsp1-aac-cali.bin
-vendor/firmware/cs35l41-dsp1-diag.wmfw
-vendor/firmware/cs35l41-dsp1-prot.wmfw
-vendor/firmware/cs35l41-dsp1-qissheng-cali.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-indmusic-aac.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-indmusic-qisheng.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-music-aac.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-music-qisheng.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-notification-aac.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-notification-qisheng.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-ringtone-aac.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-ringtone-qisheng.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-voice-aac.bin
-vendor/firmware/cs35l41-dsp1-spk-prot-voice-qisheng.bin
-vendor/firmware/default_configuration.hfd.cfg.json
-vendor/firmware/marley-dsp2-aov-frontend.wmfw
-vendor/firmware/marley-dsp2-aov-vrgain.bin
-vendor/firmware/marley-dsp3-aov-control.wmfw
-vendor/firmware/mfc_fw.bin
-vendor/firmware/pp_cfg.json
-vendor/firmware/sec_s3nrn81_firmware.bin
-vendor/firmware/sec_s3nrn82_firmware.bin
-vendor/firmware/tracker_cfg.json
-
-## Gatekeeper
-vendor/lib/hw/gatekeeper.exynos9610.so
-vendor/lib64/hw/gatekeeper.exynos9610.so
-
-## GPS
-vendor/bin/hw/gpsd
-vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service
-vendor/etc/gnss/ca.pem
-vendor/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc
-vendor/lib64/hw/android.hardware.gnss@1.0-impl.so:vendor/lib64/hw/android.hardware.gnss@1.0-impl.samsung.so
-vendor/lib64/hw/android.hardware.gnss@1.1-impl.so:vendor/lib64/hw/android.hardware.gnss@1.1-impl.samsung.so
-vendor/lib64/hw/android.hardware.gnss@2.0-impl.so:vendor/lib64/hw/android.hardware.gnss@2.0-impl.samsung.so
-vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so
-vendor/lib64/vendor.samsung.hardware.gnss@1.0.so
-
-## Graphics
-vendor/lib/egl/libGLES_mali.so
-vendor/lib64/egl/libGLES_mali.so
-
-## Keymaster
-vendor/lib/hw/keystore.exynos9610.so
-vendor/lib64/hw/keystore.exynos9610.so
-
-## IMS
-vendor/bin/charon
-vendor/bin/wfc-pkt-router
-vendor/lib64/libcharon.so
-vendor/lib64/libstrongswan.so
-
-## Media
-vendor/bin/hw/samsung.hardware.media.c2@1.1-default-service
-vendor/etc/init/samsung.hardware.media.c2@1.1-default-service.rc
-
-## Mobicore
-vendor/app/mcRegistry/00060308060501020000000000000000.tlbin
-vendor/app/mcRegistry/07010000000000000000000000000000.tlbin
-vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin
-vendor/app/mcRegistry/07061000000000000000000000000000.tlbin
-vendor/app/mcRegistry/09090000070100010000000000000000.tlbin
-vendor/app/mcRegistry/FFFFFFFFD00000000000000000000016.tlbin
-vendor/app/mcRegistry/ffffffff00000000000000000000000e.tlbin
-vendor/app/mcRegistry/ffffffffd0000000000000000000000e.tlbin
-vendor/bin/mcDriverDaemon
-vendor/lib/libMcClient.so
-vendor/lib64/libMcClient.so
-
-## NFC
-vendor/etc/sec_s3nrn82_rfreg.bin
-
-## Power
-vendor/lib/hw/power.exynos9610.so
-vendor/lib64/hw/power.exynos9610.so
-
-## Secure Element
-vendor/bin/hw/android.hardware.secure_element@1.2-uicc-service
-vendor/etc/init/android.hardware.secure_element@1.2-uicc-service.rc
-
-## Sensors
-vendor/lib/libhubconnection.so
-vendor/lib/sensors.rp.so
-vendor/lib64/libhubconnection.so
-vendor/lib64/sensors.rp.so
-
-## Thermal
-vendor/bin/exynos-thermald
-vendor/lib/hw/thermal.exynos9610.so
-vendor/lib64/hw/thermal.exynos9610.so
-
-## Wi-Fi
-vendor/etc/wifi/mx
-vendor/etc/wifi/mx140.bin
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_smdk/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_smdk/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_smdk/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_smdk/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_smdk/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/bluetooth/bt.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/bluetooth/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/platform.txt
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140/debug/common/log-strings.bin
-vendor/etc/wifi/mx140/debug/hardware/moredump/cortexR7.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mb_ap2wlbt_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mb_apm2wlbt_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mb_cp2wlbt_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mb_shub2wlbt_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mb_wlbt2abox_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mb_wlbt2gnss_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.bin
-vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/peri_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/periph_gic_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/periph_int_ifc_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/periph_scu_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/pmu_conf_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/rf_chip_registers.xml
-vendor/etc/wifi/mx140/debug/wlan/hip_signals.xml
-vendor/etc/wifi/mx140/debug/wlan/hydra_config.sdb
-vendor/etc/wifi/mx140/debug/wlan/id.txt
-vendor/etc/wifi/mx140/debug/wlan/mib_out.xml
-vendor/etc/wifi/mx140/debug/wlan/symbols.dbg
-vendor/etc/wifi/mx140/debug/wlan/unicli.dbg
-vendor/etc/wifi/mx140/debug/wlan/unitab.dbg
-vendor/etc/wifi/mx140/debug/wlan/univif.dbg
-vendor/etc/wifi/mx140/debug/wlan/xide_mib.dbg
-vendor/etc/wifi/mx140_t.bin
-vendor/etc/wifi/mx140_t/conf/leman_s612_smdk/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s612_smdk/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s612_smdk/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_smdk/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_smdk/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_smdk/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/platform.txt
-vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan_sw.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan_t.hcf
-vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan_t_sw.hcf
-vendor/etc/wifi/mx140_t/debug/common/log-strings.bin
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexR7.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_ap2wlbt_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_apm2wlbt_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_cp2wlbt_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_shub2wlbt_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_wlbt2abox_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_wlbt2gnss_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.bin
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/peri_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/periph_gic_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/periph_int_ifc_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/periph_scu_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/pmu_conf_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/rf_chip_registers.xml
-vendor/etc/wifi/mx140_t/debug/wlan/hip_signals.xml
-vendor/etc/wifi/mx140_t/debug/wlan/hydra_config.sdb
-vendor/etc/wifi/mx140_t/debug/wlan/id.txt
-vendor/etc/wifi/mx140_t/debug/wlan/mib_out.xml
-vendor/etc/wifi/mx140_t/debug/wlan/symbols.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/unicli.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/unitab.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/univif.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/xide_mib.dbg
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 8b21460..be5b9cd 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -12,11 +12,127 @@ product/etc/permissions/privapp-permissions-com.motorola.camera2.xml
 product/etc/permissions/privapp-permissions-com.motorola.camera2.xml
 product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera2.xml
 product/priv-app/MotCamera2/MotCamera2.apk
+vendor/lib/libENF.so
+vendor/lib/libexynoscamera_hifi_plugin.so
+vendor/lib/libexynoscamera_hifills_plugin.so
+vendor/lib/libexynoscamera_plugin.so
+vendor/lib/libexynoscamera_plugin_utils.so
+vendor/lib/libexynoscamera_vdis_plugin.so
+vendor/lib/libhifills.so
+vendor/lib/libvdis.so
+vendor/lib/libyuvrepro.so
+vendor/lib64/libENF.so
+vendor/lib64/libexynoscamera_hifi_plugin.so
+vendor/lib64/libexynoscamera_hifills_plugin.so
+vendor/lib64/libexynoscamera_plugin.so
+vendor/lib64/libexynoscamera_plugin_utils.so
+vendor/lib64/libexynoscamera_vdis_plugin.so
+vendor/lib64/libhifills.so
+vendor/lib64/libvdis.so
+vendor/lib64/libyuvrepro.so
+
+# Camera - Shims - Built in lineage-21, and prebuilt here.
+vendor/lib/libdemangle.so|d3fc0883a09a0debbf79ddd4bba922e79cb3d9ee
+vendor/lib64/libdemangle.so|ac9a52ac9146d0eceaeaba5e0c47f0d2c14e4428
+
+## Charger
+vendor/bin/charge_only_mode
+
+## DRM
+vendor/lib/liboemcrypto.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/lib/libwvhidl.so
+
+## Fingerprint
+vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-rbs
+vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-rbs.rc
+vendor/lib/hw/vendor.egistec.hardware.fingerprint@4.0-impl.so
+vendor/lib/vendor.egistec.hardware.fingerprint@4.0.so
+vendor/lib64/hw/vendor.egistec.hardware.fingerprint@4.0-impl.so
+vendor/lib64/libRbsFlow.so
+vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so
+
+## Firmware
+vendor/firmware/AP_AUDIO_SLSI.bin
+vendor/firmware/CC_DRAM_CODE_FLASH_HIFI.bin
+vendor/firmware/CC_DTCM_CODE_FLASH_HIFI.bin
+vendor/firmware/CC_ITCM_CODE_FLASH_HIFI.bin
+vendor/firmware/CP_AUDIO_SLSI.bin
+vendor/firmware/WithLightFixNoBN.SDNNmodel
+vendor/firmware/aw8695_haptic.bin
+vendor/firmware/aw8695_rtp.bin
+vendor/firmware/aw8695_rtp_Attentive.bin
+vendor/firmware/aw8695_rtp_Bird_Loop.bin
+vendor/firmware/aw8695_rtp_Crazy_Dream.bin
+vendor/firmware/aw8695_rtp_Curve_Ball_Blend.bin
+vendor/firmware/aw8695_rtp_Ether_Shake.bin
+vendor/firmware/aw8695_rtp_Hello.bin
+vendor/firmware/aw8695_rtp_Momentum.bin
+vendor/firmware/aw8695_rtp_Moto.bin
+vendor/firmware/aw8695_rtp_Natural.bin
+vendor/firmware/aw8695_rtp_Pyxis.bin
+vendor/firmware/aw8695_rtp_Simple.bin
+vendor/firmware/aw8695_rtp_Sparse.bin
+vendor/firmware/bl.unchecked.bin
+vendor/firmware/bu24218_Rev1.5_S_data1.bin
+vendor/firmware/bu24218_Rev1.5_S_data2.bin
+vendor/firmware/bu24218_cal_data_default.bin
+vendor/firmware/calliope_dram.bin
+vendor/firmware/calliope_sram.bin
+vendor/firmware/cs35l41-dsp1-aac-cali.bin
+vendor/firmware/cs35l41-dsp1-diag.wmfw
+vendor/firmware/cs35l41-dsp1-prot.wmfw
+vendor/firmware/cs35l41-dsp1-qissheng-cali.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-indmusic-aac.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-indmusic-qisheng.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-music-aac.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-music-qisheng.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-notification-aac.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-notification-qisheng.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-ringtone-aac.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-ringtone-qisheng.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-voice-aac.bin
+vendor/firmware/cs35l41-dsp1-spk-prot-voice-qisheng.bin
+vendor/firmware/default_configuration.hfd.cfg.json
+vendor/firmware/marley-dsp2-aov-frontend.wmfw
+vendor/firmware/marley-dsp2-aov-vrgain.bin
+vendor/firmware/marley-dsp3-aov-control.wmfw
+vendor/firmware/mfc_fw.bin
+vendor/firmware/pp_cfg.json
+vendor/firmware/sec_s3nrn81_firmware.bin
+vendor/firmware/sec_s3nrn82_firmware.bin
+vendor/firmware/tracker_cfg.json
+
+## Gatekeeper
+vendor/lib/hw/gatekeeper.exynos9610.so
+vendor/lib64/hw/gatekeeper.exynos9610.so
+
+## GPS
+vendor/bin/hw/gpsd
+vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service
+vendor/etc/gnss/ca.pem
+vendor/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc
+vendor/lib64/hw/android.hardware.gnss@1.0-impl.so:vendor/lib64/hw/android.hardware.gnss@1.0-impl.samsung.so
+vendor/lib64/hw/android.hardware.gnss@1.1-impl.so:vendor/lib64/hw/android.hardware.gnss@1.1-impl.samsung.so
+vendor/lib64/hw/android.hardware.gnss@2.0-impl.so:vendor/lib64/hw/android.hardware.gnss@2.0-impl.samsung.so
+vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so
+vendor/lib64/vendor.samsung.hardware.gnss@1.0.so
+
+## Graphics
+vendor/lib/egl/libGLES_mali.so
+vendor/lib64/egl/libGLES_mali.so
 
 ## HotwordEnrollment
 product/priv-app/HotwordEnrollmentOKGoogleWM8280/HotwordEnrollmentOKGoogleWM8280.apk
 product/priv-app/HotwordEnrollmentXGoogleWM8280/HotwordEnrollmentXGoogleWM8280.apk
 
+## Keymaster
+vendor/lib/hw/keystore.exynos9610.so
+vendor/lib64/hw/keystore.exynos9610.so
+
 ## IMS
 system/app/ShannonIms/ShannonIms.apk|e85ce47d7cdfc7dbf0b68eb8ee5ed1bc3de2841a
 system/lib64/libmedia.so:system/lib64/libmedia_ims.so
@@ -27,3 +143,196 @@ system_ext/app/ShannonNetworkService/ShannonNetworkService.apk|507e83f2e419866ca
 system_ext/app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk|be7a4a6ce5534fcc7bcde7018bf7f060c2b0f2ed
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
+vendor/bin/charon
+vendor/bin/wfc-pkt-router
+vendor/lib64/libcharon.so
+vendor/lib64/libstrongswan.so
+
+## Media
+vendor/bin/hw/samsung.hardware.media.c2@1.1-default-service
+vendor/etc/init/samsung.hardware.media.c2@1.1-default-service.rc
+
+## Mobicore
+vendor/app/mcRegistry/00060308060501020000000000000000.tlbin
+vendor/app/mcRegistry/07010000000000000000000000000000.tlbin
+vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin
+vendor/app/mcRegistry/07061000000000000000000000000000.tlbin
+vendor/app/mcRegistry/09090000070100010000000000000000.tlbin
+vendor/app/mcRegistry/FFFFFFFFD00000000000000000000016.tlbin
+vendor/app/mcRegistry/ffffffff00000000000000000000000e.tlbin
+vendor/app/mcRegistry/ffffffffd0000000000000000000000e.tlbin
+vendor/bin/mcDriverDaemon
+vendor/lib/libMcClient.so
+vendor/lib64/libMcClient.so
+
+## NFC
+vendor/etc/sec_s3nrn82_rfreg.bin
+
+## Power
+vendor/lib/hw/power.exynos9610.so
+vendor/lib64/hw/power.exynos9610.so
+
+## Secure Element
+vendor/bin/hw/android.hardware.secure_element@1.2-uicc-service
+vendor/etc/init/android.hardware.secure_element@1.2-uicc-service.rc
+
+## Sensors
+vendor/lib/libhubconnection.so
+vendor/lib/sensors.rp.so
+vendor/lib64/libhubconnection.so
+vendor/lib64/sensors.rp.so
+
+## Thermal
+vendor/bin/exynos-thermald
+vendor/lib/hw/thermal.exynos9610.so
+vendor/lib64/hw/thermal.exynos9610.so
+
+## Wi-Fi
+vendor/etc/wifi/mx
+vendor/etc/wifi/mx140.bin
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_flexi/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_maestro_siso/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_dualfem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_robusta2_nofem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_smdk/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_smdk/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_smdk/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_smdk/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_smdk/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_troika_dualfem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/bluetooth/bt.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/bluetooth/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/platform.txt
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140/conf/leman_s620_wing_dualfem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140/debug/common/log-strings.bin
+vendor/etc/wifi/mx140/debug/hardware/moredump/cortexR7.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mb_ap2wlbt_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mb_apm2wlbt_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mb_cp2wlbt_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mb_shub2wlbt_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mb_wlbt2abox_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mb_wlbt2gnss_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.bin
+vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/peri_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/periph_gic_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/periph_int_ifc_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/periph_scu_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/pmu_conf_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/rf_chip_registers.xml
+vendor/etc/wifi/mx140/debug/wlan/hip_signals.xml
+vendor/etc/wifi/mx140/debug/wlan/hydra_config.sdb
+vendor/etc/wifi/mx140/debug/wlan/id.txt
+vendor/etc/wifi/mx140/debug/wlan/mib_out.xml
+vendor/etc/wifi/mx140/debug/wlan/symbols.dbg
+vendor/etc/wifi/mx140/debug/wlan/unicli.dbg
+vendor/etc/wifi/mx140/debug/wlan/unitab.dbg
+vendor/etc/wifi/mx140/debug/wlan/univif.dbg
+vendor/etc/wifi/mx140/debug/wlan/xide_mib.dbg
+vendor/etc/wifi/mx140_t.bin
+vendor/etc/wifi/mx140_t/conf/leman_s612_smdk/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s612_smdk/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s612_smdk/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_flexi/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_maestro_siso/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_dualfem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_robusta2_nofem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_smdk/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_smdk/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_smdk/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_troika_dualfem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/platform.txt
+vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan_sw.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan_t.hcf
+vendor/etc/wifi/mx140_t/conf/leman_s620_wing_dualfem/wlan/wlan_t_sw.hcf
+vendor/etc/wifi/mx140_t/debug/common/log-strings.bin
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexR7.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_ap2wlbt_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_apm2wlbt_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_cp2wlbt_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_shub2wlbt_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_wlbt2abox_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mb_wlbt2gnss_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.bin
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/peri_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/periph_gic_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/periph_int_ifc_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/periph_scu_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/pmu_conf_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/rf_chip_registers.xml
+vendor/etc/wifi/mx140_t/debug/wlan/hip_signals.xml
+vendor/etc/wifi/mx140_t/debug/wlan/hydra_config.sdb
+vendor/etc/wifi/mx140_t/debug/wlan/id.txt
+vendor/etc/wifi/mx140_t/debug/wlan/mib_out.xml
+vendor/etc/wifi/mx140_t/debug/wlan/symbols.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/unicli.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/unitab.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/univif.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/xide_mib.dbg
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 8cc8366..e9ce0da 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -31,7 +31,6 @@ write_headers "kane troika"
 
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt"
-write_makefiles "${MY_DIR}/proprietary-files-vendor.txt" true
 
 # Finish
 write_footers
-- 
2.20.1