From 2585b28c9f6dcbeca4e10f52e7e15efbcf9bcccc Mon Sep 17 00:00:00 2001
From: Kyuofox <kyuofox@gmail.com>
Date: Tue, 15 Aug 2023 15:42:01 +0800
Subject: [PATCH] sky: Replace libutils with VNDK v32 for display composer

Change-Id: I4079f46bebda0203d5af98b658eee4bcc838ed5b
---
 Android.bp       |  1 +
 device.mk        |  4 ++++
 extract-files.sh |  8 ++++++++
 ndk/Android.bp   | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 ndk/Android.bp

diff --git a/Android.bp b/Android.bp
index cae4d9a..9ba2427 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,5 +7,6 @@
 soong_namespace {
     imports: [
         "hardware/qcom-caf/bootctrl",
+        "vendor/qcom/opensource/commonsys-intf/display",
     ],
 }
diff --git a/device.mk b/device.mk
index 0d9e95a..8a68e7b 100644
--- a/device.mk
+++ b/device.mk
@@ -457,6 +457,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
 
+# VNDK
+PRODUCT_COPY_FILES += \
+    prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v32.so
+
 # Wi-Fi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
diff --git a/extract-files.sh b/extract-files.sh
index 4e7e98e..c337707 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -54,6 +54,14 @@ if [ -z "${SRC}" ]; then
     SRC="adb"
 fi
 
+function blob_fixup() {
+    case "${1}" in
+        vendor/bin/hw/vendor.qti.hardware.display.composer-service)
+            "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
+            ;;
+    esac
+}
+
 # Initialize the helper
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
diff --git a/ndk/Android.bp b/ndk/Android.bp
new file mode 100644
index 0000000..4a5c850
--- /dev/null
+++ b/ndk/Android.bp
@@ -0,0 +1,41 @@
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V1-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V1-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V2-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V2-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V3-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V3-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V4-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V4-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V5-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V5-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.display.config-V6-ndk_platform",
+    shared_libs: ["vendor.qti.hardware.display.config-V6-ndk"],
+    system_ext_specific: true,
+    vendor_available: true,
+}