exynos9610-common: Shim strongswan with libcrypto_shim
authorMichael Bestas <mkbestas@gmail.com>
Tue, 10 Sep 2024 21:04:13 +0000 (00:04 +0300)
committerNolen Johnson <johnsonnolen@gmail.com>
Fri, 25 Oct 2024 00:38:54 +0000 (00:38 +0000)
The following change
https://github.com/google/boringssl/commit/e202e51cb0912f36dafbd2e67cf04d6ec82f3180
removed symbols that our libs require.

Change-Id: I1325c34ecec3d339dd68c665010ecb36fa2e6a29

common.mk
extract-files.sh

index a27da5a12a9b0cab2cc934095c899f398ded1329..701907a180036deec97e341c3589853889e96f75 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -226,7 +226,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@3.0.vendor \
     android.hardware.keymaster@3.0-impl \
-    android.hardware.keymaster@3.0-service
+    android.hardware.keymaster@3.0-service \
+    libcrypto_shim
 
 # Lights
 PRODUCT_PACKAGES += \
index e28a257fcd7ef475abbeed01404e21c53f6a2953..bb7e2c301bc4410ed29428a62f050123b1fe497a 100755 (executable)
@@ -100,6 +100,10 @@ function blob_fixup() {
                 "${PATCHELF}" --add-needed "libdemangle.so" "${LIBDEMANGLE}"
             done
             ;;
+        vendor/lib64/libstrongswan.so)
+            [ "$2" = "" ] && return 0
+            "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
+            ;;
         # Remove libhidltransport/libhwbinder references
         vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-rbs|vendor/lib64/hw/android.hardware.gnss@1.0-impl.samsung.so|vendor/lib64/hw/android.hardware.gnss@1.1-impl.samsung.so|vendor/lib64/hw/android.hardware.gnss@2.0-impl.samsung.so|vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so)
             [ "$2" = "" ] && return 0