From e4084571edbf215964359c47257f81642ed76bdf Mon Sep 17 00:00:00 2001
From: SamarV-121 <samarvispute121@pm.me>
Date: Wed, 17 Aug 2022 14:54:42 +0900
Subject: [PATCH] universal7885: Link libexynosdisplay against VNDK 32 libutils

Abort message: 'incStrongRequireStrong() called on 0x7bc685a760 which isn't already owned'
Also remove the unused VNDK copy
---
 universal7885-common/extract-files.sh        | 3 +++
 universal7885-common/universal7885-common.mk | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/universal7885-common/extract-files.sh b/universal7885-common/extract-files.sh
index c15f36c..c27d6e0 100644
--- a/universal7885-common/extract-files.sh
+++ b/universal7885-common/extract-files.sh
@@ -25,6 +25,9 @@ function blob_fixup {
 	vendor/lib*/libsensorlistener.so)
 		grep -q libshim_sensorndkbridge.so "$2" || "$PATCHELF" --add-needed "libshim_sensorndkbridge.so" "$2"
 		;;
+        vendor/lib*/libexynosdisplay.so)
+            "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
+            ;;
 	esac
 }
 
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 54ade80..092af3b 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -286,11 +286,11 @@ PRODUCT_PACKAGES += \
 
 # VNDK
 PRODUCT_COPY_FILES += \
-    prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so
+    prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libutils-v32.so
 
 ifeq ($(TARGET_LOCAL_ARCH),arm64)
 PRODUCT_COPY_FILES += \
-    prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so
+    prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v32.so
 endif
 
 # Workaround for vintf issues...