sm8450-common: Fix QCC ELF checks

Change-Id: I0c3ba4608feb0ceb971fba1d0e436f0bfd5b4314

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