Browse Source

sm8450-common: Fix QCC ELF checks

Change-Id: I0c3ba4608feb0ceb971fba1d0e436f0bfd5b4314
Cosmin Tanislav 10 months ago
parent
commit
e772e00264
2 changed files with 25 additions and 3 deletions
  1. 3 3
      proprietary-files.txt
  2. 22 0
      setup-makefiles.sh

+ 3 - 3
proprietary-files.txt

@@ -614,13 +614,13 @@ system_ext/lib64/[email protected]|9663f4512a1e33956a
 system_ext/lib64/[email protected]|db1ea124c0f42fcc1a814d69308d4f9522012e1b
 system_ext/lib64/[email protected]|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/[email protected]|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/[email protected];[email protected]|ef866bab2186db1b2c09477e36fef20945fa671e
-vendor/lib64/[email protected];DISABLE_CHECKELF;[email protected]|0677ebfe099cdaa6c3776d0bd5318044a4220918
+vendor/lib64/[email protected];[email protected]|0677ebfe099cdaa6c3776d0bd5318044a4220918
 vendor/lib64/[email protected]|304ce0a1571f218ba16d0812221e4b2fae52a6d9
 vendor/lib64/[email protected];[email protected]|bfddf0a295b391bc1ed7961d547e9b56e3aa1b9c
 

+ 22 - 0
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
+        [email protected] | \
+        [email protected] | \
+        [email protected])
+            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