diff --git a/Android.bp b/Android.bp
index d2239d7..aac0ef0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10145,94 +10145,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libdapparamstorage",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libdapparamstorage.so",
- ],
- shared_libs: [
- "libcutils",
- "libutils",
- "liblog",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libdeccfg",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libdeccfg.so",
- ],
- shared_libs: [
- "libhidlbase",
- "vendor.dolby.hardware.dms@2.0",
- "libcutils",
- "libutils",
- "liblog",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libdlbdsservice",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libdlbdsservice.so",
- ],
- shared_libs: [
- "libutils",
- "libstagefright_foundation-v33",
- "liblog",
- "libxml2",
- "libdapparamstorage",
- "libsqlite",
- "libhidlbase",
- "vendor.dolby.hardware.dms@2.0",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libfgauge_gm30",
owner: "xiaomi",
@@ -13683,35 +13595,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libwifi-hal-mtk",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libwifi-hal-mtk.so",
- ],
- shared_libs: [
- "libbase",
- "libcutils",
- "liblog",
- "libnl",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libwpfa",
owner: "xiaomi",
@@ -26838,96 +26721,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libswdap",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/soundfx/libswdap.so",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libcutils",
- "libaudioutils",
- "libdapparamstorage",
- "libhidlbase",
- "vendor.dolby.hardware.dms@2.0",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- relative_install_path: "soundfx",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "vendor.dolby.hardware.dms@2.0-impl",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so",
- ],
- shared_libs: [
- "libhidlbase",
- "libutils",
- "liblog",
- "libdapparamstorage",
- "libdlbdsservice",
- "vendor.dolby.hardware.dms@2.0",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "vendor.dolby.hardware.dms@2.0",
- owner: "xiaomi",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so",
- ],
- shared_libs: [
- "libhidlbase",
- "liblog",
- "libutils",
- "libcutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "vendor.mediatek.hardware.apuware.apusys@2.0",
owner: "xiaomi",
@@ -29003,15 +28796,6 @@ prebuilt_etc_xml {
soc_specific: true,
}
-prebuilt_etc_xml {
- name: "manifest_vendor.dolby.hardware.dms.xml",
- owner: "xiaomi",
- src: "proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml",
- filename_from_src: true,
- sub_dir: "vintf/manifest",
- soc_specific: true,
-}
-
prebuilt_etc_xml {
name: "vendor.xiaomi.sensor.citsensorservice@2.0-service.xml",
owner: "xiaomi",
@@ -29572,38 +29356,6 @@ cc_prebuilt_binary {
soc_specific: true,
}
-cc_prebuilt_binary {
- name: "vendor.dolby.hardware.dms@2.0-service",
- owner: "xiaomi",
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libhidlbase",
- "libdapparamstorage",
- "libdlbdsservice",
- "vendor.dolby.hardware.dms@2.0",
- "vendor.dolby.hardware.dms@2.0-impl",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- strip: {
- none: true,
- },
- prefer: true,
- relative_install_path: "hw",
- soc_specific: true,
-}
-
cc_prebuilt_binary {
name: "vendor.mediatek.hardware.mmagent@1.1-service",
owner: "xiaomi",
diff --git a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service b/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service
deleted file mode 100755
index bd2b853..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service and /dev/null differ
diff --git a/proprietary/vendor/etc/dolby/dax-default.xml b/proprietary/vendor/etc/dolby/dax-default.xml
deleted file mode 100644
index 21e36af..0000000
--- a/proprietary/vendor/etc/dolby/dax-default.xml
+++ /dev/null
@@ -1,1588 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc b/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
deleted file mode 100644
index 03b7d0d..0000000
--- a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-service dms-hal-2-0 /vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service
- class hal
- user media
- group audio media
-on post-fs-data
- mkdir /data/vendor/dolby 0770 media media
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml b/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml
deleted file mode 100644
index f52fb36..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- vendor.dolby.hardware.dms
- hwbinder
- 2.0
-
- IDms
- default
-
-
-
diff --git a/proprietary/vendor/lib64/libdapparamstorage.so b/proprietary/vendor/lib64/libdapparamstorage.so
deleted file mode 100644
index 92a7088..0000000
Binary files a/proprietary/vendor/lib64/libdapparamstorage.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdeccfg.so b/proprietary/vendor/lib64/libdeccfg.so
deleted file mode 100644
index 9715bfb..0000000
Binary files a/proprietary/vendor/lib64/libdeccfg.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdlbdsservice.so b/proprietary/vendor/lib64/libdlbdsservice.so
deleted file mode 100644
index f124bdd..0000000
Binary files a/proprietary/vendor/lib64/libdlbdsservice.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libwifi-hal-mtk.so b/proprietary/vendor/lib64/libwifi-hal-mtk.so
deleted file mode 100644
index 335d1bc..0000000
Binary files a/proprietary/vendor/lib64/libwifi-hal-mtk.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/soundfx/libswdap.so b/proprietary/vendor/lib64/soundfx/libswdap.so
deleted file mode 100644
index 8cacbff..0000000
Binary files a/proprietary/vendor/lib64/soundfx/libswdap.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so
deleted file mode 100644
index a4584bd..0000000
Binary files a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so
deleted file mode 100644
index 669c2a7..0000000
Binary files a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so and /dev/null differ
diff --git a/tanzanite-vendor.mk b/tanzanite-vendor.mk
index 77705d7..19d63a8 100644
--- a/tanzanite-vendor.mk
+++ b/tanzanite-vendor.mk
@@ -535,7 +535,6 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/camera/xml/tanzanite/sceneDetection_tanzanite_wide_iii.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/xml/tanzanite/sceneDetection_tanzanite_wide_iii.xml \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/camera/xml/xiaomiSceneDetection.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/xml/xiaomiSceneDetection.xml \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/cust_color_dsi_o7_38_0c_0a_dsc_vdo.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cust_color_dsi_o7_38_0c_0a_dsc_vdo.xml \
- vendor/xiaomi/tanzanite/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/dsi_o7_38_0c_0a_dsc_vdo_mi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dsi_o7_38_0c_0a_dsc_vdo_mi.xml \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/ecc_list.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list.xml \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/ecc_list_OP01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP01.xml \
@@ -594,7 +593,6 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/tee-supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee-supplicant.rc \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/tetheroffloadservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tetheroffloadservice.rc \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/v3avpud.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/v3avpud.rc \
- vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.hardware.dms@2.0-service.rc \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/vendor.mediatek.hardware.mmagent@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mmagent@1.1-service.rc \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/vendor.mediatek.hardware.mms@1.6-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mms@1.6-service.rc \
vendor/xiaomi/tanzanite/proprietary/vendor/etc/init/vendor.mediatek.hardware.nvram@1.1-sevice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.nvram@1.1-sevice.rc \
@@ -1078,9 +1076,6 @@ PRODUCT_PACKAGES += \
libconnfem \
libcustom_nvram \
libcvsd_mtk \
- libdapparamstorage \
- libdeccfg \
- libdlbdsservice \
libfgauge_gm30 \
libfile_op \
libforkexecwrap \
@@ -1201,7 +1196,6 @@ PRODUCT_PACKAGES += \
libwa_dof \
libwa_rtdof \
libwapi \
- libwifi-hal-mtk \
libwpfa \
libwvhidl \
libwvkeybox \
@@ -1632,9 +1626,6 @@ PRODUCT_PACKAGES += \
sc202v_truly_macro_mipi_raw_IdxMgr \
sc202v_truly_macro_mipi_raw_tuning \
libmtkcam_streaminfo_plugin-p1stt \
- libswdap \
- vendor.dolby.hardware.dms@2.0-impl \
- vendor.dolby.hardware.dms@2.0 \
vendor.mediatek.hardware.apuware.apusys@2.0 \
vendor.mediatek.hardware.apuware.apusys@2.1 \
vendor.mediatek.hardware.apuware.hmp@1.0 \
@@ -1712,7 +1703,6 @@ PRODUCT_PACKAGES += \
manifest_apuware_utils.xml \
manifest_cameraprovider.xml \
manifest_media_c2_V1_2_default.xml \
- manifest_vendor.dolby.hardware.dms.xml \
vendor.xiaomi.sensor.citsensorservice@2.0-service.xml \
batterysecret \
ccci_mdinit \
@@ -1730,7 +1720,6 @@ PRODUCT_PACKAGES += \
camerahalserver \
mtkfusionrild \
tetheroffloadservice \
- vendor.dolby.hardware.dms@2.0-service \
vendor.mediatek.hardware.mmagent@1.1-service \
vendor.mediatek.hardware.mms@1.6-service \
vendor.mediatek.hardware.nvram@1.1-service \