m1s1: Shim libwvhidl with libcrypto_shim

The following change google/boringssl@e202e51 removed symbols that our libs require. Change-Id: I1325c34ecec3d339dd68c665010ecb36fa2e6a29
LineageOS · Oct 24, 2024 · 1266120 · 1266120
1 parent 138a79b
commit 1266120
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/device-common.mk b/device-common.mk
@@ -629,7 +629,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # DRM
 PRODUCT_PACKAGES += \
-    android.hardware.drm-service.clearkey
+    android.hardware.drm-service.clearkey \
+    libcrypto_shim
 
 PRODUCT_PROPERTY_OVERRIDES += \
     drm.service.enabled=true \

diff --git a/marlin/extract-files.sh b/marlin/extract-files.sh
@@ -97,6 +97,7 @@ function blob_fixup() {
         vendor/lib/libwvhidl.so)
         [ "$2" = "" ] && return 0
         "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
+         grep -q libcrypto_shim.so "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
             ;;
         vendor/lib64/libcne.so)
         [ "$2" = "" ] && return 0
@@ -113,6 +114,7 @@ function blob_fixup() {
         vendor/lib64/libwvhidl.so)
         [ "$2" = "" ] && return 0
         "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
+         grep -q libcrypto_shim.so "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
             ;;
         # Patch legacy blobs to use binder instead of vndbinder
         vendor/bin/pm-service)

diff --git a/sailfish/extract-files.sh b/sailfish/extract-files.sh
@@ -97,6 +97,7 @@ function blob_fixup() {
         vendor/lib/libwvhidl.so)
         [ "$2" = "" ] && return 0
         "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
+         grep -q libcrypto_shim.so "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
             ;;
         vendor/lib64/libcne.so)
         [ "$2" = "" ] && return 0
@@ -113,6 +114,8 @@ function blob_fixup() {
         vendor/lib64/libwvhidl.so)
         [ "$2" = "" ] && return 0
         "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
+        grep -q libcrypto_shim.so "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
+
             ;;
         # Patch legacy blobs to use binder instead of vndbinder
         vendor/bin/pm-service)