From a91b06d0749e3293e754d6879fa60051e5ddc244 Mon Sep 17 00:00:00 2001
From: Woomymy <woomy@woomy.be>
Date: Fri, 29 Dec 2023 10:02:56 +0100
Subject: [PATCH] rosemary: Add a shim to link sensor blobs against
 `android.hardware.sensors@1.0-convert`

* `libndksensorbridge` was converted to AIDL and is no longer linked to
  this static library that contains symbols required by our sensor
  blobs. Add a shim linked to `android.hardware.sensors@1.0-convert` to
  fix our sensors

Change-Id: I969f97bb15d0abcc71f87352722995db3826e122
Signed-off-by: Woomymy <woomy@woomy.be>
---
 device.mk           |  1 +
 extract-files.sh    |  6 ++++++
 libshims/Android.bp | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/device.mk b/device.mk
index 3fc722b..7e8efa6 100644
--- a/device.mk
+++ b/device.mk
@@ -439,6 +439,7 @@ PRODUCT_PACKAGES += \
     android.hardware.sensors@2.0-ScopedWakelock.vendor
 
 PRODUCT_PACKAGES += \
+    libshim_sensors \
     libsensorndkbridge
 
 # Shipping API level
diff --git a/extract-files.sh b/extract-files.sh
index ea872e0..6393fb5 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -77,6 +77,12 @@ function blob_fixup {
         vendor/lib64/libmtkcam_stdutils.so)
             "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
             ;;
+        vendor/bin/mnld|\
+        vendor/lib*/libaalservice.so|\
+        vendor/lib*/libcam.utils.sensorprovider.so|\
+        vendor/lib*/librgbwlightsensor.so)
+            "$PATCHELF" --add-needed "libshim_sensors.so" "$2"
+            ;;
         vendor/lib*/hw/vendor.mediatek.hardware.pq@2.13-impl.so)
             "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
             ;;
diff --git a/libshims/Android.bp b/libshims/Android.bp
index 376c356..1108409 100644
--- a/libshims/Android.bp
+++ b/libshims/Android.bp
@@ -1,3 +1,21 @@
+//
+// Copyright (C) 2023 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+cc_library_shared {
+    name: "libshim_sensors",
+    whole_static_libs: [
+        "android.hardware.sensors@1.0-convert"
+    ],
+    shared_libs: [
+        "libhardware",
+        "libhidlbase",
+        "android.hardware.sensors@1.0"
+    ],
+    vendor: true
+}
+
 cc_library_shared {
     name: "libshim_sink",
     srcs: ["libshim_sink.cpp"],