From 5d865a7eb656f61ec9d491e4b0cd3021882f8d8d Mon Sep 17 00:00:00 2001 From: Pranav Vashi Date: Mon, 22 Jan 2024 12:29:03 +0000 Subject: [PATCH] walleye: Link dolby blobs with v33 libstagefright_foundation Signed-off-by: Pranav Vashi --- device.mk | 2 ++ extract-files.sh | 4 ++++ proprietary-files-vendor.txt | 14 +++++++------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/device.mk b/device.mk index 90a5934..ef92601 100644 --- a/device.mk +++ b/device.mk @@ -127,6 +127,8 @@ PRODUCT_COPY_FILES += \ # VNDK PRODUCT_COPY_FILES += \ + prebuilts/vndk/v33/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefright_foundation-v33.so \ + prebuilts/vndk/v33/arm64/arch-arm64-armv8-a/shared/vndk-core/libstagefright_foundation.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libstagefright_foundation-v33.so \ prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libhidlbase-v32.so \ prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libhidlbase-v32.so \ prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhidlbase-v32.so \ diff --git a/extract-files.sh b/extract-files.sh index 56b5f6e..4fef66f 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -76,6 +76,10 @@ function blob_fixup() { lib*/com.qualcomm.qti.imsrtpservice@1.0.so | vendor/bin/cnd | vendor/bin/ims_rtp_daemon | vendor/bin/imsrcsd | vendor/bin/netmgrd | vendor/lib*/com.quicinc.cne.api@1.0.so) "${PATCHELF}" --replace-needed "libhidlbase.so" "libhidlbase-v32.so" "${2}" ;; + # Link dolby blobs with v33 libstagefright_foundation + vendor/lib/libstagefright_soft_ddpdec.so | vendor/lib/libstagefright_soft_ac4dec.so | vendor/lib/libstagefrightdolby.so | vendor/lib64/libstagefright_soft_ddpdec.so | vendor/lib64/libdlbdsservice.so | vendor/lib64/libstagefright_soft_ac4dec.so | vendor/lib64/libstagefrightdolby.so) + "${PATCHELF}" --replace-needed "libstagefright_foundation.so" "libstagefright_foundation-v33.so" "${2}" + ;; esac } diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt index 6eb59c0..0f0e1e8 100644 --- a/proprietary-files-vendor.txt +++ b/proprietary-files-vendor.txt @@ -776,18 +776,18 @@ vendor/lib/soundfx/libswgamedap.so|c7d35eb932ecffb384ec62628404df3406b63919 vendor/lib/soundfx/libswvqe.so|3009202dcdd5b8fadb9c43a8cf5f0fe1c28311a6 vendor/lib/libdapparamstorage.so|ce5f2fadc1e7d3811d73d49f64254b7054a57259 vendor/lib/libdeccfg.so|050de5edb5fb7dabba9b59bfafcb5a1366285d3c -vendor/lib/libstagefright_soft_ac4dec.so|c0fdd6101abf5dbc162c6eee815db40131b94d6c -vendor/lib/libstagefright_soft_ddpdec.so|9718a2040fba0ad28bd7f55caa849bd9b983f6ca -vendor/lib/libstagefrightdolby.so|7dcbe2a14024579b2cd657d266ce3ad35faeeed6 +vendor/lib/libstagefright_soft_ac4dec.so|8e42b8c6a145cbc2d844e1609d5415faf739d3ec +vendor/lib/libstagefright_soft_ddpdec.so|b9e1aadc1c8cf7d709130d36b9c30a1f6f649b5a +vendor/lib/libstagefrightdolby.so|1c13964cd6919e9947cf1451a77baf12ccd83810 vendor/lib/vendor.dolby.hardware.dms@2.0.so|aaf98796bfa8b384e2b5e162214ca46f6eca5dbc vendor/lib64/soundfx/libswdap.so|e996ee1d421b3b2cf74f3f3ed93bff067d83dddb vendor/lib64/soundfx/libswgamedap.so|c898fd5b51312c5fafa693ca037423c5bae23101 vendor/lib64/soundfx/libswvqe.so|08394e1ac285479213604c35cb144147fdac68c0 vendor/lib64/libdapparamstorage.so|7549aeba2b7041b472ffc1f5fd39a56e4be64a2b vendor/lib64/libdeccfg.so|3a63582be7dea50ae10c0543f68e3bce592a3877 -vendor/lib64/libdlbdsservice.so|ccae69075705a71358e363eee973f32d76288696 -vendor/lib64/libstagefright_soft_ac4dec.so|45b4a08175e6b5226b34e7275ce60d4b76033041 -vendor/lib64/libstagefright_soft_ddpdec.so|7f1ee1710cdb5d4334613a765e04bec5d807fea2 -vendor/lib64/libstagefrightdolby.so|884abf462a46d0e0281c8157418c513cd4dc003a +vendor/lib64/libdlbdsservice.so|8d070318884f02e50ad1831bb29f8bde6af33168 +vendor/lib64/libstagefright_soft_ac4dec.so|d8d2dd47ca0552d4e1c5df7ad9b3becfd6d43179 +vendor/lib64/libstagefright_soft_ddpdec.so|9f921ef725bdd1edc26b484df86b10e2909f760b +vendor/lib64/libstagefrightdolby.so|319814f3d8968e002bc1591b8e90e6eda745f79b vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so|92eb0a2b730810881288119fc4d038f52870acd1 vendor/lib64/vendor.dolby.hardware.dms@2.0.so|a93b5cf33ae57387a2d32686520a0d1dd5d10dcc