From 64a1bd47330536e78308f324f323c26082492d42 Mon Sep 17 00:00:00 2001 From: Michael Bestas 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 ++++ husky/extract-files.py | 4 ++++ husky/proprietary-files-vendor.txt | 2 +- shiba/extract-files.py | 4 ++++ shiba/proprietary-files-vendor.txt | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/device-lineage.mk b/device-lineage.mk index 165fecc..9503ffc 100644 --- a/device-lineage.mk +++ b/device-lineage.mk @@ -31,6 +31,10 @@ include device/google/gs-common/wireless_charger/wireless_charger.mk PRODUCT_PACKAGES += \ libexynosv4l2 +# GNSS +PRODUCT_PACKAGES += \ + android.hardware.sensors-V2-ndk.vendor:64 + # Graphics PRODUCT_PACKAGES += \ libEGL_angle \ diff --git a/husky/extract-files.py b/husky/extract-files.py index 9bfc0f4..28886fa 100755 --- a/husky/extract-files.py +++ b/husky/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, ) @@ -47,6 +48,7 @@ lib_fixups: lib_fixups_user_type = { 'vendor.google.whitechapel.audio.audioext@4.0', 'vendor.google.whitechapel.audio.extension-V4-ndk', ): lib_fixup_vendor_suffix, + 'android.hardware.sensors-V2-ndk': lib_fixup_remove, } blob_fixups: blob_fixups_user_type = { @@ -76,7 +78,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/husky/proprietary-files-vendor.txt b/husky/proprietary-files-vendor.txt index dd62072..5376cab 100644 --- a/husky/proprietary-files-vendor.txt +++ b/husky/proprietary-files-vendor.txt @@ -32,7 +32,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@2.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 diff --git a/shiba/extract-files.py b/shiba/extract-files.py index 23a399a..3bcfaf0 100755 --- a/shiba/extract-files.py +++ b/shiba/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, ) @@ -47,6 +48,7 @@ lib_fixups: lib_fixups_user_type = { 'vendor.google.whitechapel.audio.audioext@4.0', 'vendor.google.whitechapel.audio.extension-V4-ndk', ): lib_fixup_vendor_suffix, + 'android.hardware.sensors-V2-ndk': lib_fixup_remove, } blob_fixups: blob_fixups_user_type = { @@ -76,7 +78,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/shiba/proprietary-files-vendor.txt b/shiba/proprietary-files-vendor.txt index cd9936f..85db8b3 100644 --- a/shiba/proprietary-files-vendor.txt +++ b/shiba/proprietary-files-vendor.txt @@ -30,7 +30,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@2.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