From 62990a33291e379cceb54ae6ec401e6e2dec5eb4 Mon Sep 17 00:00:00 2001
From: bengris32 <bengris32@protonmail.ch>
Date: Tue, 7 Nov 2023 16:26:14 +0100
Subject: [PATCH] rosemary: Link sensor libraries against stock
 `libsensorndkbridge`

* libsensorndkbridge was converted to use AIDL, yay...

Change-Id: I7611acbc48093646c614cd8066c9dc40bdd7f9a2
Signed-off-by: bengris32 <bengris32@protonmail.ch>
---
 extract-files.sh      | 12 ++++++++++++
 proprietary-files.txt |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/extract-files.sh b/extract-files.sh
index f53ec78..8747c24 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -58,6 +58,9 @@ function blob_fixup {
         lib64/libshowlogo.so)
             "${PATCHELF}" --add-needed "libshim_showlogo.so" "${2}"
             ;;
+        vendor/bin/mnld)
+            "${PATCHELF}" --replace-needed "libsensorndkbridge.so" "libsensorndkbridge-hidl.so" "$2"
+            ;;
         vendor/bin/mtk_agpsd)
            "${PATCHELF}" --replace-needed "libcrypto.so" "libcrypto-v32.so" "${2}"
             ;;
@@ -81,9 +84,18 @@ function blob_fixup {
             "${PATCHELF_0_8}" --remove-needed "libhidlbase.so" "${2}"
             sed -i "s/libhidltransport.so/libhidlbase-v32.so\x00/" "${2}"
             ;;
+        vendor/lib*/libaalservice.so)
+            "${PATCHELF}" --replace-needed "libsensorndkbridge.so" "libsensorndkbridge-hidl.so" "$2"
+            ;;
+        vendor/lib*/libcam.utils.sensorprovider.so)
+            "${PATCHELF}" --replace-needed "libsensorndkbridge.so" "libsensorndkbridge-hidl.so" "$2"
+            ;;
         vendor/lib64/libgf_hal.so)
             sed -i 's/\xff\xc3\x01\xd1\xfd\x7b\x06\xa9/\x00\x00\x80\xd2\xc0\x03\x5f\xd6/g' "${2}"
             ;;
+        vendor/lib*/librgbwlightsensor.so)
+            "${PATCHELF}" --replace-needed "libsensorndkbridge.so" "libsensorndkbridge-hidl.so" "$2"
+            ;;
         vendor/lib64/hw/fingerprint.fpc.default.so)
             sed -i 's/\xff\x43\x01\xd1\xfd\x7b\x02\xa9/\xc0\x03\x5f\xd6\xfd\x7b\x02\xa9/g' "${2}"
             ;;
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 809e6d9..595c28d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -2563,6 +2563,7 @@ vendor/etc/elliptic_sensor.xml
 vendor/lib/libakm.so
 vendor/lib/libhwm.so
 vendor/lib/librgbwlightsensor.so
+vendor/lib/libsensorndkbridge.so:vendor/lib/libsensorndkbridge-hidl.so
 vendor/lib64/hw/android.hardware.sensors@2.X-subhal-mediatek.so
 vendor/lib64/hw/sensors.elliptic.so
 vendor/lib64/hw/sensors.mt6785.so
@@ -2570,6 +2571,7 @@ vendor/lib64/libakm.so
 vendor/lib64/libhwm.so
 vendor/lib64/libksensor.so
 vendor/lib64/librgbwlightsensor.so
+vendor/lib64/libsensorndkbridge.so:vendor/lib64/libsensorndkbridge-hidl.so
 vendor/lib64/libsensor_custom.so
 
 # Soter