From cb75ade8dbe6cd94ceb7c3f1f26e24ea1dcec7e3 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 --- cheetah/extract-files.py | 4 ++++ cheetah/proprietary-files-vendor.txt | 2 +- device-lineage.mk | 4 ++++ panther/extract-files.py | 4 ++++ panther/proprietary-files-vendor.txt | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cheetah/extract-files.py b/cheetah/extract-files.py index 0f06cf1..829bbd2 100755 --- a/cheetah/extract-files.py +++ b/cheetah/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/cheetah/proprietary-files-vendor.txt b/cheetah/proprietary-files-vendor.txt index 83a6b7c..a604f75 100644 --- a/cheetah/proprietary-files-vendor.txt +++ b/cheetah/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@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 diff --git a/device-lineage.mk b/device-lineage.mk index 3c7241d..7b47d29 100644 --- a/device-lineage.mk +++ b/device-lineage.mk @@ -39,6 +39,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml +# GNSS +PRODUCT_PACKAGES += \ + android.hardware.sensors-V2-ndk.vendor:64 + # Graphics PRODUCT_PACKAGES += \ libEGL_angle \ diff --git a/panther/extract-files.py b/panther/extract-files.py index 99c20d5..d6c2135 100755 --- a/panther/extract-files.py +++ b/panther/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/panther/proprietary-files-vendor.txt b/panther/proprietary-files-vendor.txt index 02406c4..c1f1b4e 100644 --- a/panther/proprietary-files-vendor.txt +++ b/panther/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