diff --git a/Android.bp b/Android.bp
index 17fb86f..f0f41e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5447,6 +5447,416 @@ prebuilt_rfsa {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libdapparamstorage_v3_6",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/libdapparamstorage_v3_6.so",
+ ],
+ shared_libs: [
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/libdapparamstorage_v3_6.so",
+ ],
+ shared_libs: [
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libdeccfg_v3_6",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/libdeccfg_v3_6.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/libdeccfg_v3_6.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libdlbdsservice_v3_6",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/libdlbdsservice_v3_6.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "libstagefright_foundation",
+ "liblog",
+ "libxml2",
+ "libdapparamstorage_v3_6",
+ "libsqlite",
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/libdlbdsservice_v3_6.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "libstagefright_foundation",
+ "liblog",
+ "libxml2",
+ "libdapparamstorage_v3_6",
+ "libsqlite",
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libqtigef_odm",
+ stem: "libqtigef",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/libqtigef.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/libqtigef.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libhwdap_v3_6",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/soundfx/libhwdap_v3_6.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage_v3_6",
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/soundfx/libhwdap_v3_6.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage_v3_6",
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ relative_install_path: "soundfx",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libswdap_v3_6",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/soundfx/libswdap_v3_6.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage_v3_6",
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/soundfx/libswdap_v3_6.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage_v3_6",
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ relative_install_path: "soundfx",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "vendor.dolby_v3_6.hardware.dms360@2.0-impl",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "libutils",
+ "liblog",
+ "libdapparamstorage_v3_6",
+ "libdlbdsservice_v3_6",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "libutils",
+ "liblog",
+ "libdapparamstorage_v3_6",
+ "libdlbdsservice_v3_6",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "vendor.dolby_v3_6.hardware.dms360@2.0",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ device_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libstagefright_soft_ddpdec",
+ owner: "xiaomi",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/odm/lib/libstagefright_soft_ddpdec.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "libdeccfg_v3_6",
+ "libstagefright_omx",
+ "libstagefright_softomx",
+ "libstagefright_foundation",
+ "libutils",
+ "libcutils",
+ "libmedia_omx",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ prefer: true,
+ device_specific: true,
+}
+
+prebuilt_etc_xml {
+ name: "manifest_dax_dolby_v3_6.xml",
+ owner: "xiaomi",
+ src: "proprietary/odm/etc/vintf/manifest/manifest_dax_dolby_v3_6.xml",
+ filename_from_src: true,
+ sub_dir: "vintf/manifest",
+ device_specific: true,
+}
+
cc_prebuilt_binary {
name: "batterysecret",
owner: "xiaomi",
@@ -5565,3 +5975,36 @@ cc_prebuilt_binary {
prefer: true,
soc_specific: true,
}
+
+cc_prebuilt_binary {
+ name: "vendor.dolby_v3_6.hardware.dms360@2.0-service",
+ owner: "xiaomi",
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service",
+ ],
+ shared_libs: [
+ "libstagefright_foundation-v33",
+ "liblog",
+ "libutils",
+ "libhidlbase",
+ "libdapparamstorage_v3_6",
+ "libdlbdsservice_v3_6",
+ "vendor.dolby_v3_6.hardware.dms360@2.0",
+ "vendor.dolby_v3_6.hardware.dms360@2.0-impl",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ strip: {
+ none: true,
+ },
+ prefer: true,
+ relative_install_path: "hw",
+ device_specific: true,
+}
diff --git a/proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service b/proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service
new file mode 100755
index 0000000..f889790
Binary files /dev/null and b/proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service differ
diff --git a/proprietary/odm/etc/dolby/multimedia_dolby_dax_default.xml b/proprietary/odm/etc/dolby/multimedia_dolby_dax_default.xml
new file mode 100644
index 0000000..8b502b2
--- /dev/null
+++ b/proprietary/odm/etc/dolby/multimedia_dolby_dax_default.xml
@@ -0,0 +1,3252 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/odm/etc/init/vendor.dolby_v3_6.hardware.dms360@2.0-service.rc b/proprietary/odm/etc/init/vendor.dolby_v3_6.hardware.dms360@2.0-service.rc
new file mode 100644
index 0000000..33143b7
--- /dev/null
+++ b/proprietary/odm/etc/init/vendor.dolby_v3_6.hardware.dms360@2.0-service.rc
@@ -0,0 +1,6 @@
+service dms-v36-hal-2-0 /odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@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/odm/etc/vintf/manifest/manifest_dax_dolby_v3_6.xml b/proprietary/odm/etc/vintf/manifest/manifest_dax_dolby_v3_6.xml
new file mode 100644
index 0000000..8f3c72b
--- /dev/null
+++ b/proprietary/odm/etc/vintf/manifest/manifest_dax_dolby_v3_6.xml
@@ -0,0 +1,11 @@
+
+
+ vendor.dolby_v3_6.hardware.dms360
+ hwbinder
+ 2.0
+
+ IDms
+ default
+
+
+
diff --git a/proprietary/odm/lib/libdapparamstorage_v3_6.so b/proprietary/odm/lib/libdapparamstorage_v3_6.so
new file mode 100644
index 0000000..2c744cd
Binary files /dev/null and b/proprietary/odm/lib/libdapparamstorage_v3_6.so differ
diff --git a/proprietary/odm/lib/libdeccfg_v3_6.so b/proprietary/odm/lib/libdeccfg_v3_6.so
new file mode 100644
index 0000000..74aa6ae
Binary files /dev/null and b/proprietary/odm/lib/libdeccfg_v3_6.so differ
diff --git a/proprietary/odm/lib/libdlbdsservice_v3_6.so b/proprietary/odm/lib/libdlbdsservice_v3_6.so
new file mode 100644
index 0000000..c66e4d5
Binary files /dev/null and b/proprietary/odm/lib/libdlbdsservice_v3_6.so differ
diff --git a/proprietary/odm/lib/libqtigef.so b/proprietary/odm/lib/libqtigef.so
new file mode 100644
index 0000000..8dc4567
Binary files /dev/null and b/proprietary/odm/lib/libqtigef.so differ
diff --git a/proprietary/odm/lib/libstagefright_soft_ddpdec.so b/proprietary/odm/lib/libstagefright_soft_ddpdec.so
new file mode 100644
index 0000000..275387e
Binary files /dev/null and b/proprietary/odm/lib/libstagefright_soft_ddpdec.so differ
diff --git a/proprietary/odm/lib/soundfx/libhwdap_v3_6.so b/proprietary/odm/lib/soundfx/libhwdap_v3_6.so
new file mode 100644
index 0000000..9c4b421
Binary files /dev/null and b/proprietary/odm/lib/soundfx/libhwdap_v3_6.so differ
diff --git a/proprietary/odm/lib/soundfx/libswdap_v3_6.so b/proprietary/odm/lib/soundfx/libswdap_v3_6.so
new file mode 100644
index 0000000..5d99dad
Binary files /dev/null and b/proprietary/odm/lib/soundfx/libswdap_v3_6.so differ
diff --git a/proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so b/proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so
new file mode 100644
index 0000000..0941240
Binary files /dev/null and b/proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so differ
diff --git a/proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0.so b/proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0.so
new file mode 100644
index 0000000..c59f30b
Binary files /dev/null and b/proprietary/odm/lib/vendor.dolby_v3_6.hardware.dms360@2.0.so differ
diff --git a/proprietary/odm/lib64/libdapparamstorage_v3_6.so b/proprietary/odm/lib64/libdapparamstorage_v3_6.so
new file mode 100644
index 0000000..35057be
Binary files /dev/null and b/proprietary/odm/lib64/libdapparamstorage_v3_6.so differ
diff --git a/proprietary/odm/lib64/libdeccfg_v3_6.so b/proprietary/odm/lib64/libdeccfg_v3_6.so
new file mode 100644
index 0000000..9d00555
Binary files /dev/null and b/proprietary/odm/lib64/libdeccfg_v3_6.so differ
diff --git a/proprietary/odm/lib64/libdlbdsservice_v3_6.so b/proprietary/odm/lib64/libdlbdsservice_v3_6.so
new file mode 100644
index 0000000..5265f25
Binary files /dev/null and b/proprietary/odm/lib64/libdlbdsservice_v3_6.so differ
diff --git a/proprietary/odm/lib64/libqtigef.so b/proprietary/odm/lib64/libqtigef.so
new file mode 100644
index 0000000..5c2dd7a
Binary files /dev/null and b/proprietary/odm/lib64/libqtigef.so differ
diff --git a/proprietary/odm/lib64/soundfx/libhwdap_v3_6.so b/proprietary/odm/lib64/soundfx/libhwdap_v3_6.so
new file mode 100644
index 0000000..2ad1add
Binary files /dev/null and b/proprietary/odm/lib64/soundfx/libhwdap_v3_6.so differ
diff --git a/proprietary/odm/lib64/soundfx/libswdap_v3_6.so b/proprietary/odm/lib64/soundfx/libswdap_v3_6.so
new file mode 100644
index 0000000..cd10c0f
Binary files /dev/null and b/proprietary/odm/lib64/soundfx/libswdap_v3_6.so differ
diff --git a/proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so b/proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so
new file mode 100644
index 0000000..d38d034
Binary files /dev/null and b/proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0-impl.so differ
diff --git a/proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0.so b/proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0.so
new file mode 100644
index 0000000..5c1895c
Binary files /dev/null and b/proprietary/odm/lib64/vendor.dolby_v3_6.hardware.dms360@2.0.so differ
diff --git a/sweet-vendor.mk b/sweet-vendor.mk
index 341172d..278f80d 100644
--- a/sweet-vendor.mk
+++ b/sweet-vendor.mk
@@ -6,6 +6,8 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/xiaomi/sweet
PRODUCT_COPY_FILES += \
+ vendor/xiaomi/sweet/proprietary/odm/etc/dolby/multimedia_dolby_dax_default.xml:$(TARGET_COPY_OUT_ODM)/etc/dolby/multimedia_dolby_dax_default.xml \
+ vendor/xiaomi/sweet/proprietary/odm/etc/init/vendor.dolby_v3_6.hardware.dms360@2.0-service.rc:$(TARGET_COPY_OUT_ODM)/etc/init/vendor.dolby_v3_6.hardware.dms360@2.0-service.rc \
vendor/xiaomi/sweet/proprietary/vendor/etc/acdbdata/Forte/Forte_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_Bluetooth_cal.acdb \
vendor/xiaomi/sweet/proprietary/vendor/etc/acdbdata/Forte/Forte_Codec_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_Codec_cal.acdb \
vendor/xiaomi/sweet/proprietary/vendor/etc/acdbdata/Forte/Forte_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_General_cal.acdb \
@@ -391,7 +393,18 @@ PRODUCT_PACKAGES += \
misound_res \
misound_res_headphone \
misound_res_spk \
+ libdapparamstorage_v3_6 \
+ libdeccfg_v3_6 \
+ libdlbdsservice_v3_6 \
+ libqtigef_odm \
+ libhwdap_v3_6 \
+ libswdap_v3_6 \
+ vendor.dolby_v3_6.hardware.dms360@2.0-impl \
+ vendor.dolby_v3_6.hardware.dms360@2.0 \
+ libstagefright_soft_ddpdec \
+ manifest_dax_dolby_v3_6.xml \
batterysecret \
mi_thermald \
sensors.qti \
- thermal-engine
+ thermal-engine \
+ vendor.dolby_v3_6.hardware.dms360@2.0-service