From a868c64a5c1bdfe5aaba6f311c9f17dd51b7b31f Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim@linux4.de>
Date: Thu, 15 Sep 2022 21:04:49 +0200
Subject: [PATCH] beyondx: Use libshim_sfpex instead of VNDK28 libc++

Change-Id: I5947e608ecc54f1e4e2636be8564a2ffe876d207
---
 device.mk             | 4 ++++
 extract-files.sh      | 4 ++--
 proprietary-files.txt | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/device.mk b/device.mk
index 73f1423..9bb86d1 100644
--- a/device.mk
+++ b/device.mk
@@ -25,3 +25,7 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+# Shims
+PRODUCT_PACKAGES += \
+    libshim_sfpex
diff --git a/extract-files.sh b/extract-files.sh
index b3e43d8..6725528 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -17,8 +17,8 @@ function blob_fixup() {
             xxd -p "${2}" | sed "s/8b022036/1f2003d5/g" | xxd -r -p > "${2}".patched
             mv "${2}".patched "${2}"
             ;;
-        vendor/lib*/libiu456_datapath_processor.so)
-            "${PATCHELF}" --replace-needed libc++.so libc++-v28.so "${2}"
+        vendor/lib64/libiu456_datapath_processor.so)
+            "${PATCHELF}" --add-needed libshim_sfpex.so "${2}"
             ;;
     esac
 }
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9f4916c..dccc92d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -43,10 +43,6 @@ vendor/firmware/bcm4375B1_semco_sem.hcd
 -vendor/lib64/libTOFProc_interface.so
 -vendor/lib64/libiu456_datapath_processor.so
 
-# libc++ from prebuilts/vndk/v28 - android-12.0.0_r18
--vendor/lib/libc++-v28.so|c77ce1010570c92687079ab3a287fbfa4f081be2
--vendor/lib64/libc++-v28.so|373888fd449538b11083d3597775a32e02395339
-
 ## Codecs
 vendor/etc/media_codecs_performance.xml