From e772e00264f5cd7692b685ae75133aa3cf021701 Mon Sep 17 00:00:00 2001
From: Cosmin Tanislav <demonsingur@gmail.com>
Date: Fri, 16 Aug 2024 22:12:06 +0300
Subject: [PATCH] sm8450-common: Fix QCC ELF checks

Change-Id: I0c3ba4608feb0ceb971fba1d0e436f0bfd5b4314
---
 proprietary-files.txt |  6 +++---
 setup-makefiles.sh    | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 5feae95..69aa6d4 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -614,13 +614,13 @@ system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so|9663f4512a1e33956a
 system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so|db1ea124c0f42fcc1a814d69308d4f9522012e1b
 system_ext/lib64/vendor.qti.hardware.qccvndhal@1.0.so|15a47e8d6f3746e3cb3baa91577f206a1089edd5
 system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so|ffccfde321f48e390c5af8d546e1c7cdf23f9152
-vendor/bin/qcc-trd;DISABLE_CHECKELF|146a8d4ba56aebee8056f988159358943dc148c9
+vendor/bin/qcc-trd|146a8d4ba56aebee8056f988159358943dc148c9
 vendor/etc/init/init.qdmastats.rc|d7ddb87faaedd900f1756064fe756d50efed7ca9
 vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so|459d506b20124520f5d650a7b30c9a490514a878
 vendor/lib64/libgrpc++_unsecure.so|e0363df07498ac7f3beb9e6f017d79e2bbc53c9c
-vendor/lib64/libqcc_file_agent.so;DISABLE_CHECKELF|2062da8684a791c3c8afe57f8be3d2b010337a8a
+vendor/lib64/libqcc_file_agent.so|2062da8684a791c3c8afe57f8be3d2b010337a8a
 vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so;MODULE=vendor.qti.hardware.qccsyshal@1.0-vendor|ef866bab2186db1b2c09477e36fef20945fa671e
-vendor/lib64/vendor.qti.hardware.qccsyshal@1.1.so;DISABLE_CHECKELF;MODULE=vendor.qti.hardware.qccsyshal@1.1-vendor|0677ebfe099cdaa6c3776d0bd5318044a4220918
+vendor/lib64/vendor.qti.hardware.qccsyshal@1.1.so;MODULE=vendor.qti.hardware.qccsyshal@1.1-vendor|0677ebfe099cdaa6c3776d0bd5318044a4220918
 vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so|304ce0a1571f218ba16d0812221e4b2fae52a6d9
 vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so;MODULE=vendor.qti.hardware.qccvndhal@1.0-vendor|bfddf0a295b391bc1ed7961d547e9b56e3aa1b9c
 
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 3418a0b..2c6253a 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -34,6 +34,28 @@ function vendor_imports() {
 EOF
 }
 
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        vendor.qti.hardware.qccsyshal@1.0 | \
+        vendor.qti.hardware.qccsyshal@1.1 | \
+        vendor.qti.hardware.qccvndhal@1.0)
+            echo "$1-vendor"
+            ;;
+        *)
+            return 1
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" || \
+    lib_to_package_fixup_proto_3_9_1 "$1" || \
+    lib_to_package_fixup_vendor_variants "$@"
+}
+
 # Initialize the helper for common
 setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true