From fa9d414d8619a1c9a6cc65ab40a97033337cf23f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 11 Sep 2024 00:04:13 +0300 Subject: [PATCH] dre: Shim widevine with libcrypto_shim The following change https://github.com/google/boringssl/commit/e202e51cb0912f36dafbd2e67cf04d6ec82f3180 removed symbols that our libs require. Change-Id: I1325c34ecec3d339dd68c665010ecb36fa2e6a29 --- device.mk | 3 ++- extract-files.sh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 91f5eee..fda4f99 100644 --- a/device.mk +++ b/device.mk @@ -208,7 +208,8 @@ PRODUCT_PACKAGES += \ # DRM PRODUCT_PACKAGES += \ android.hardware.drm@1.3.vendor \ - android.hardware.drm-service.clearkey + android.hardware.drm-service.clearkey \ + libcrypto_shim # fastbootd PRODUCT_PACKAGES += \ diff --git a/extract-files.sh b/extract-files.sh index e7cb068..07066e5 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -59,6 +59,10 @@ fi function blob_fixup() { case "${1}" in + odm/lib64/libwvhidl.so|odm/lib64/mediadrm/libwvdrmengine.so) + [ "$2" = "" ] && return 0 + grep -q "libcrypto_shim.so" "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}" + ;; product/etc/sysconfig/com.android.hotwordenrollment.common.util.xml) [ "$2" = "" ] && return 0 sed -i "s/\/my_product/\/product/" "${2}"