From 8994ad487a00166517e70a18bb56fc8c83b2d1f3 Mon Sep 17 00:00:00 2001
From: Cosmin Tanislav <demonsingur@gmail.com>
Date: Sat, 17 Aug 2024 02:23:32 +0300
Subject: [PATCH] sm6375-common: fix com.qualcomm.qti.dpm.api@1.0 ELF checks

Change-Id: I759752ccc133d7047d415eb83c5d3c55820437a4
---
 proprietary-files.txt |  2 +-
 setup-makefiles.sh    | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index ee12a53..44ccbd3 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -316,7 +316,7 @@ system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so
 -system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
 vendor/bin/dpmQmiMgr
 vendor/etc/init/dpmQmiMgr.rc
-vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
+vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE=com.qualcomm.qti.dpm.api@1.0-vendor
 vendor/lib64/libdpmqmihal.so
 
 # DRM
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 5a5bbad..13824dd 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -37,6 +37,27 @@ function vendor_imports() {
 EOF
 }
 
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        com.qualcomm.qti.dpm.api@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