diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index b8a9851..4d44767 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -1215,6 +1215,47 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libdapparamstorage",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/libdapparamstorage.so",
+ ],
+ shared_libs: [
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ android_arm64: {
+ srcs: [
+ "proprietary/vendor/lib64/libdapparamstorage.so",
+ ],
+ shared_libs: [
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "both",
+ prefer: true,
+ soc_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "libdiag",
owner: "asus",
@@ -3190,6 +3231,49 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "vendor.dolby.hardware.dms@2.0",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ 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: "both",
+ prefer: true,
+ soc_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "vendor.qti.hardware.dsp@1.0",
owner: "asus",
@@ -4051,6 +4135,35 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libdeccfg",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/libdeccfg.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "vendor.dolby.hardware.dms@2.0",
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ prefer: true,
+ soc_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "libdrc",
owner: "asus",
@@ -4317,6 +4430,170 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libstagefright_soft_ac4dec",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/libstagefright_soft_ac4dec.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "vendor.dolby.hardware.dms@2.0",
+ "libdeccfg",
+ "libstagefright_foundation-v33",
+ "libutils",
+ "libcutils",
+ "liblog",
+ "libstagefright_omx",
+ "libstagefright_softomx",
+ "libmedia_omx",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libstagefright_soft_ddpdec",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/libstagefright_soft_ddpdec.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "vendor.dolby.hardware.dms@2.0",
+ "libdeccfg",
+ "libstagefright_omx",
+ "libstagefright_softomx",
+ "libstagefright_foundation-v33",
+ "libutils",
+ "libcutils",
+ "libmedia_omx",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libswdap",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/soundfx/libswdap.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage",
+ "libhidlbase",
+ "vendor.dolby.hardware.dms@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ relative_install_path: "soundfx",
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libswgamedap",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/soundfx/libswgamedap.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage",
+ "libhidlbase",
+ "vendor.dolby.hardware.dms@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ relative_install_path: "soundfx",
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libswvqe",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm: {
+ srcs: [
+ "proprietary/vendor/lib/soundfx/libswvqe.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libaudioutils",
+ "libdapparamstorage",
+ "libhidlbase",
+ "vendor.dolby.hardware.dms@2.0",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "32",
+ relative_install_path: "soundfx",
+ prefer: true,
+ soc_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "com.qualcomm.qti.dpm.api@1.0_vendor",
stem: "com.qualcomm.qti.dpm.api@1.0",
@@ -5851,6 +6128,39 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libdlbdsservice",
+ owner: "asus",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/vendor/lib64/libdlbdsservice.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "libstagefright_foundation-v33",
+ "liblog",
+ "libxml2",
+ "libcrypto",
+ "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: "libdpmqmihal",
owner: "asus",
@@ -7810,6 +8120,36 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "vendor.dolby.hardware.dms@2.0-impl",
+ owner: "asus",
+ 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.qti.data.factory@2.0_vendor",
stem: "vendor.qti.data.factory@2.0",
@@ -15711,6 +16051,15 @@ prebuilt_etc_xml {
soc_specific: true,
}
+prebuilt_etc_xml {
+ name: "manifest_vendor.dolby.hardware.dms.xml",
+ owner: "asus",
+ src: "proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml",
+ filename_from_src: true,
+ sub_dir: "vintf/manifest",
+ soc_specific: true,
+}
+
cc_prebuilt_binary {
name: "adpl",
owner: "asus",
@@ -16073,6 +16422,38 @@ cc_prebuilt_binary {
soc_specific: true,
}
+cc_prebuilt_binary {
+ name: "vendor.dolby.hardware.dms@2.0-service",
+ owner: "asus",
+ 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.qti.hardware.alarm@1.0-service",
owner: "asus",
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service
new file mode 100644
index 0000000..647dfac
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service differ
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
new file mode 100644
index 0000000..03b7d0d
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
@@ -0,0 +1,6 @@
+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/sdm660-common/proprietary/vendor/etc/media_codecs_dolby_audio.xml b/sdm660-common/proprietary/vendor/etc/media_codecs_dolby_audio.xml
new file mode 100644
index 0000000..1c98a62
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/media_codecs_dolby_audio.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sdm660-common/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml b/sdm660-common/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml
new file mode 100644
index 0000000..f52fb36
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml
@@ -0,0 +1,11 @@
+
+
+ vendor.dolby.hardware.dms
+ hwbinder
+ 2.0
+
+ IDms
+ default
+
+
+
diff --git a/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so b/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so
new file mode 100644
index 0000000..0358a35
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdeccfg.so b/sdm660-common/proprietary/vendor/lib/libdeccfg.so
new file mode 100644
index 0000000..084bfb6
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libdeccfg.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so b/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so
new file mode 100644
index 0000000..41584f3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so b/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so
new file mode 100644
index 0000000..7c98394
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so b/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so
new file mode 100644
index 0000000..16dcb03
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so b/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so
new file mode 100644
index 0000000..114320a
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so b/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so
new file mode 100644
index 0000000..cda19bc
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so b/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so
new file mode 100644
index 0000000..b73dbf2
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so b/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so
new file mode 100644
index 0000000..3e440da
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdlbdsservice.so b/sdm660-common/proprietary/vendor/lib64/libdlbdsservice.so
new file mode 100644
index 0000000..203004d
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libdlbdsservice.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so b/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so
new file mode 100644
index 0000000..97c9fb5
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so
new file mode 100644
index 0000000..ab05eec
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so differ
diff --git a/sdm660-common/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index c819e17..f27e5fc 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -77,6 +77,7 @@ PRODUCT_COPY_FILES += \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
+ vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-service.rc \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.dsp@1.0-service.rc \
@@ -85,6 +86,7 @@ PRODUCT_COPY_FILES += \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \
vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
+ vendor/asus/sdm660-common/proprietary/vendor/etc/media_codecs_dolby_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_dolby_audio.xml \
vendor/asus/sdm660-common/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
vendor/asus/sdm660-common/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonsysnodesconfigs.xml \
vendor/asus/sdm660-common/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
@@ -137,6 +139,7 @@ PRODUCT_PACKAGES += \
libc2d30_bltlib \
libcdsp_default_listener \
libcdsprpc \
+ libdapparamstorage \
libdiag \
libfastcvadsp_stub \
libfastrpc_utf_stub \
@@ -184,6 +187,7 @@ PRODUCT_PACKAGES += \
libqcvirt \
libshoebox \
libspatialaudio \
+ vendor.dolby.hardware.dms@2.0 \
vendor.qti.hardware.dsp@1.0 \
vendor.qti.hardware.qseecom@1.0 \
vendor.qti.hardware.qteeconnector@1.0 \
@@ -213,6 +217,7 @@ PRODUCT_PACKAGES += \
libaudcal \
libaudio_log_utils \
libaudioalsa \
+ libdeccfg \
libdrc \
libdsd2pcm \
libfastcvopt \
@@ -223,6 +228,11 @@ PRODUCT_PACKAGES += \
libhdmipassthru \
libqtigef \
libsmwrapper \
+ libstagefright_soft_ac4dec \
+ libstagefright_soft_ddpdec \
+ libswdap \
+ libswgamedap \
+ libswvqe \
com.qualcomm.qti.dpm.api@1.0_vendor \
com.qualcomm.qti.imscmservice@1.0_vendor \
com.qualcomm.qti.imscmservice@2.0_vendor \
@@ -272,6 +282,7 @@ PRODUCT_PACKAGES += \
libconfigdb \
libcpion \
libdataitems \
+ libdlbdsservice \
libdpmqmihal \
libdrmfs \
libdrmtime \
@@ -336,6 +347,7 @@ PRODUCT_PACKAGES += \
qcrild_librilutils \
qtibus \
qtimutex \
+ vendor.dolby.hardware.dms@2.0-impl \
vendor.qti.data.factory@2.0_vendor \
vendor.qti.data.factory@2.1_vendor \
vendor.qti.data.factory@2.2_vendor \
@@ -688,6 +700,7 @@ PRODUCT_PACKAGES += \
vendor.qti.latency-V2.2-java \
vendor.qti.latencyaidlservice-V1-java \
manifest_android.hardware.drm@1.3-service.widevine.xml \
+ manifest_vendor.dolby.hardware.dms.xml \
adpl \
adsprpcd \
cnd \
@@ -699,6 +712,7 @@ PRODUCT_PACKAGES += \
android.hardware.gatekeeper@1.0-service-qti \
android.hardware.keymaster@3.0-service-qti \
qcrild \
+ vendor.dolby.hardware.dms@2.0-service \
vendor.qti.hardware.alarm@1.0-service \
vendor.qti.hardware.perf@2.2-service \
vendor.qti.hardware.qseecom@1.0-service \