msm8996-common: Update GPS configuration for upstream

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

7 files changed, 35 insertions, 42 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 5e247f7..67e933c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -138,6 +138,12 @@ SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(VENDOR_PATH)/config.fs
 
+# GPS
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := msm8996
+BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true
+TARGET_NO_RPC := true
+USE_DEVICE_SPECIFIC_GPS := true
+
 # Hidl manifests
 DEVICE_MANIFEST_FILE := $(VENDOR_PATH)/manifest.xml
 
diff --git a/hidl.mk b/hidl.mk
index 966b540..9d9fb18 100644
--- a/hidl.mk
+++ b/hidl.mk
@@ -53,7 +53,8 @@ PRODUCT_PACKAGES += \
 
 # GPS
 PRODUCT_PACKAGES += \
-    android.hardware.gnss@1.0-impl
+    android.hardware.gnss@1.0-impl-qti \
+    android.hardware.gnss@1.0-service-qti
     
 # Gatekeeper HAL
 PRODUCT_PACKAGES += \
diff --git a/libshims/Android.mk b/libshims/Android.mk
index 5eba3ec..6d76d02 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -14,16 +14,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# get_process_name shim
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := get_process_name.c
-
-LOCAL_MODULE := libshims_get_process_name
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
 # camera shim
 include $(CLEAR_VARS)
 
diff --git a/libshims/get_process_name.c b/libshims/get_process_name.c
deleted file mode 100644
index a25985c..0000000
--- a/libshims/get_process_name.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2017 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-static const char* process_name = "unknown";
-
-const char* get_process_name(void) {
-    return process_name;
-}
diff --git a/manifest.xml b/manifest.xml
index 87da1e2..b506b82 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -50,4 +50,22 @@
         <impl level="generic"></impl>
         <version>2.1</version>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.gnss</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IGnss</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.gnss</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ILocHidlGnss</name>
+            <instance>gnss_vendor</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/msm8996.mk b/msm8996.mk
index bf75707..904e1d1 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -149,18 +149,17 @@ PRODUCT_PACKAGES += \
 
 # GPS
 PRODUCT_PACKAGES += \
-    gps.msm8996 \
-    libcurl \
+    libgnss \
     libgnsspps \
-    libshims_get_process_name
+    libcurl
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/gps/etc/flp.conf:system/etc/flp.conf \
-    $(LOCAL_PATH)/gps/etc/gps.conf:system/etc/gps.conf \
-    $(LOCAL_PATH)/gps/etc/izat.conf:system/etc/izat.conf \
-    $(LOCAL_PATH)/gps/etc/lowi.conf:system/etc/lowi.conf \
-    $(LOCAL_PATH)/gps/etc/sap.conf:system/etc/sap.conf \
-    $(LOCAL_PATH)/gps/etc/xtwifi.conf:system/etc/xtwifi.conf
+    $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
+    $(LOCAL_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
+    $(LOCAL_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
+    $(LOCAL_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
+    $(LOCAL_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
+    $(LOCAL_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf
 
 # Graphics
 PRODUCT_PACKAGES += \
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 5c0910a..dfb81f0 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -38,7 +38,7 @@ on early-init
     mkdir /dsp 0771 media media
 
 on init
-    export LD_SHIM_LIBS "/system/vendor/lib64/libizat_core.so|libshims_get_process_name.so:/system/vendor/lib/libmmcamera_ppeiscore.so|/system/lib/libshim_camera.so:/system/vendor/lib/hw/camera.vendor.msm8996.so|/system/lib/libshim_camera.so:/system/vendor/lib64/lib-imsvt.so|libshims_ims.so"
+    export LD_SHIM_LIBS "/system/vendor/lib/libmmcamera_ppeiscore.so|/system/lib/libshim_camera.so:/system/vendor/lib/hw/camera.vendor.msm8996.so|/system/lib/libshim_camera.so:/system/vendor/lib64/lib-imsvt.so|libshims_ims.so"
 
     # Set permissions for persist partition
     mkdir /persist 0771 system system