diff --git a/device-lineage.mk b/device-lineage.mk
index b202e63..10a8bbd 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -34,6 +34,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/oriole/extract-files.py b/oriole/extract-files.py
index 0744211..05113a8 100755
--- a/oriole/extract-files.py
+++ b/oriole/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/oriole/proprietary-files-vendor.txt b/oriole/proprietary-files-vendor.txt
index 7edf14a..048f06b 100644
--- a/oriole/proprietary-files-vendor.txt
+++ b/oriole/proprietary-files-vendor.txt
@@ -27,7 +27,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/raven/extract-files.py b/raven/extract-files.py
index 00e2959..b56090e 100755
--- a/raven/extract-files.py
+++ b/raven/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/raven/proprietary-files-vendor.txt b/raven/proprietary-files-vendor.txt
index b66a484..cde8b43 100644
--- a/raven/proprietary-files-vendor.txt
+++ b/raven/proprietary-files-vendor.txt
@@ -28,7 +28,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