diff --git a/device.mk b/device.mk
index 8cd22ffb..52f8c716 100644
--- a/device.mk
+++ b/device.mk
@@ -302,19 +302,14 @@ PRODUCT_PACKAGES += \
 
 #GNSS HAL
 PRODUCT_PACKAGES += \
-    android.hardware.gnss@1.0-impl
+    gps.conf \
+    libgps.utils \
+    android.hardware.gnss@1.0-impl-qti \
+    android.hardware.gnss@1.0-service-qti
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/sec_config:system/etc/sec_config
 
-PRODUCT_PACKAGES += \
-    gps.conf \
-    gps.default \
-    libgps.utils \
-    libloc_eng \
-    libloc_api_v02 \
-    libloc_ds_api \
-    libgnsspps
 
 HOSTAPD := hostapd
 HOSTAPD += hostapd_cli
diff --git a/manifest.xml b/manifest.xml
index 81c2356d..087ed284 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -33,4 +33,10 @@
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.gnss</name>
+        <transport arch="32+64">passthrough</transport>
+        <impl level="generic"></impl>
+        <version>1.0</version>
+    </hal>
 </manifest>