From a6c73e18dc5516cd704ff49d6bf1a02677f88f35 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Thu, 6 Mar 2025 22:48:47 +0200
Subject: [PATCH] Disable ELF checks for gpsd

Somehow it depends on multiple versions of the same AIDL interface.
Disable ELF checks and remove the older dependency for now.

Change-Id: Id57ab481b248d4c394597cbb8b15d5b839b0f911
---
 device-lineage.mk                  | 4 ++++
 felix/extract-files.py             | 4 ++++
 felix/proprietary-files-vendor.txt | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/device-lineage.mk b/device-lineage.mk
index 66ef57c..eeac3a3 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -40,6 +40,10 @@ PRODUCT_PACKAGES += \
     libacryl_hdr_plugin \
     libexynosv4l2
 
+# GNSS
+PRODUCT_PACKAGES += \
+    android.hardware.sensors-V2-ndk.vendor:64
+
 # Graphics
 PRODUCT_PACKAGES += \
     libEGL_angle \
diff --git a/felix/extract-files.py b/felix/extract-files.py
index 16ec6ac..5208c4b 100755
--- a/felix/extract-files.py
+++ b/felix/extract-files.py
@@ -17,6 +17,7 @@ from extract_utils.fixups_blob import (
     blob_fixups_user_type,
 )
 from extract_utils.fixups_lib import (
+    lib_fixup_remove,
     lib_fixups,
     lib_fixups_user_type,
 )
@@ -45,6 +46,7 @@ lib_fixups: lib_fixups_user_type = {
         'com.google.edgetpu_app_service-V3-ndk',
         'com.google.edgetpu_vendor_service-V2-ndk',
     ): lib_fixup_vendor_suffix,
+    'android.hardware.sensors-V2-ndk': lib_fixup_remove,
 }
 
 blob_fixups: blob_fixups_user_type = {
@@ -74,7 +76,9 @@ module = ExtractUtilsModule(
 
 def fix_vendor_file_list(file_list: FileList):
     # flp.default & gps.default have incorrect SONAME
+    # gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
     disable_checkelf_file_paths = [
+        'vendor/bin/hw/gpsd',
         'vendor/lib64/hw/flp.default.so',
         'vendor/lib64/hw/gps.default.so',
     ]
diff --git a/felix/proprietary-files-vendor.txt b/felix/proprietary-files-vendor.txt
index b6921e0..25455b9 100644
--- a/felix/proprietary-files-vendor.txt
+++ b/felix/proprietary-files-vendor.txt
@@ -29,7 +29,7 @@ vendor/bin/hw/citadel_updater
 vendor/bin/hw/citadeld
 vendor/bin/hw/com.google.edgetpu.tachyon-service
 vendor/bin/hw/google.hardware.media.c2@1.0-service
-vendor/bin/hw/gpsd
+vendor/bin/hw/gpsd;DISABLE_CHECKELF
 vendor/bin/hw/init_citadel
 vendor/bin/hw/lhd
 vendor/bin/hw/rild_exynos