Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable ELF checks for gpsd

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

Change-Id: Id57ab481b248d4c394597cbb8b15d5b839b0f911
This commit is contained in:
Michael Bestas 2025-03-06 22:48:47 +02:00 • committed by Michael Bestas
parent 9224c1591f
commit 64a1bd4733
No known key found for this signature in database
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
device-lineage.mk
View file

@ -31,6 +31,10 @@ include device/google/gs-common/wireless_charger/wireless_charger.mk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libexynosv4l2 libexynosv4l2
# GNSS
PRODUCT_PACKAGES += \
android.hardware.sensors-V2-ndk.vendor:64
# Graphics # Graphics
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libEGL_angle \ libEGL_angle \

4
husky/extract-files.py
View file

@ -17,6 +17,7 @@ from extract_utils.fixups_blob import (
blob_fixups_user_type, blob_fixups_user_type,
) )
from extract_utils.fixups_lib import ( from extract_utils.fixups_lib import (
lib_fixup_remove,
lib_fixups, lib_fixups,
lib_fixups_user_type, 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.audioext@4.0',
'vendor.google.whitechapel.audio.extension-V4-ndk', 'vendor.google.whitechapel.audio.extension-V4-ndk',
): lib_fixup_vendor_suffix, ): lib_fixup_vendor_suffix,
'android.hardware.sensors-V2-ndk': lib_fixup_remove,
} }
blob_fixups: blob_fixups_user_type = { blob_fixups: blob_fixups_user_type = {
@ -76,7 +78,9 @@ module = ExtractUtilsModule(
def fix_vendor_file_list(file_list: FileList): def fix_vendor_file_list(file_list: FileList):
# flp.default & gps.default have incorrect SONAME # flp.default & gps.default have incorrect SONAME
# gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
disable_checkelf_file_paths = [ disable_checkelf_file_paths = [
'vendor/bin/hw/gpsd',
'vendor/lib64/hw/flp.default.so', 'vendor/lib64/hw/flp.default.so',
'vendor/lib64/hw/gps.default.so', 'vendor/lib64/hw/gps.default.so',
] ]

2
husky/proprietary-files-vendor.txt
View file

@ -32,7 +32,7 @@ vendor/bin/hw/citadel_updater
vendor/bin/hw/citadeld vendor/bin/hw/citadeld
vendor/bin/hw/com.google.edgetpu.tachyon-service vendor/bin/hw/com.google.edgetpu.tachyon-service
vendor/bin/hw/google.hardware.media.c2@2.0-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/init_citadel
vendor/bin/hw/lhd vendor/bin/hw/lhd
vendor/bin/hw/rild_exynos vendor/bin/hw/rild_exynos

4
shiba/extract-files.py
View file

@ -17,6 +17,7 @@ from extract_utils.fixups_blob import (
blob_fixups_user_type, blob_fixups_user_type,
) )
from extract_utils.fixups_lib import ( from extract_utils.fixups_lib import (
lib_fixup_remove,
lib_fixups, lib_fixups,
lib_fixups_user_type, 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.audioext@4.0',
'vendor.google.whitechapel.audio.extension-V4-ndk', 'vendor.google.whitechapel.audio.extension-V4-ndk',
): lib_fixup_vendor_suffix, ): lib_fixup_vendor_suffix,
'android.hardware.sensors-V2-ndk': lib_fixup_remove,
} }
blob_fixups: blob_fixups_user_type = { blob_fixups: blob_fixups_user_type = {
@ -76,7 +78,9 @@ module = ExtractUtilsModule(
def fix_vendor_file_list(file_list: FileList): def fix_vendor_file_list(file_list: FileList):
# flp.default & gps.default have incorrect SONAME # flp.default & gps.default have incorrect SONAME
# gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
disable_checkelf_file_paths = [ disable_checkelf_file_paths = [
'vendor/bin/hw/gpsd',
'vendor/lib64/hw/flp.default.so', 'vendor/lib64/hw/flp.default.so',
'vendor/lib64/hw/gps.default.so', 'vendor/lib64/hw/gps.default.so',
] ]

2
shiba/proprietary-files-vendor.txt
View file

@ -30,7 +30,7 @@ vendor/bin/hw/citadel_updater
vendor/bin/hw/citadeld vendor/bin/hw/citadeld
vendor/bin/hw/com.google.edgetpu.tachyon-service vendor/bin/hw/com.google.edgetpu.tachyon-service
vendor/bin/hw/google.hardware.media.c2@2.0-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/init_citadel
vendor/bin/hw/lhd vendor/bin/hw/lhd
vendor/bin/hw/rild_exynos vendor/bin/hw/rild_exynos