exynos9610-common: Shim libwvhidl with libcrypto_shim

The following change
https://github.com/google/boringssl/commit/e202e51cb0912f36dafbd2e67cf04d6ec82f3180
removed symbols that our libs require.

[npjohnson]: New Change-ID as previous commit utilized the right one.

Change-Id: I7548ba52b52800f666ee21dac55760864888f054

diff --git a/common.mk b/common.mk
index 701907a180036deec97e341c3589853889e96f75..efb6181e2b567bc99a5813f1a5ae1a1e17212a25 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -132,6 +132,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.drm-service.clearkey \
     android.hardware.drm@1.3.vendor \
+    libcrypto_shim \
     libprotobuf-cpp-lite-3.9.1-vendorcompat
 
 # FastCharge

diff --git a/extract-files.sh b/extract-files.sh
index bb7e2c301bc4410ed29428a62f050123b1fe497a..90779b8dd128523c42d9009059e09c6158d11357 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -115,6 +115,10 @@ function blob_fixup() {
             [ "$2" = "" ] && return 0
             sed -i 's|/system/framework|/vendor/framework|' "${2}"
             ;;
+        vendor/lib*/libwvhidl.so)
+            [ "$2" = "" ] && return 0
+            grep -q libcrypto_shim.so "${2}" || "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
+            ;;
         *)
             return 1
             ;;