From bf60c73d8eba95629eb89b60d0f4d43ed93616b8 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Wed, 9 Oct 2019 19:54:50 +0800
Subject: [PATCH] davinci: Build GNSS HAL

 * Remove unnecessary dependencies on liblbs_core.so
 * Hardcode vendor loc HIDL version to 3.0 to enable vendor HIDL when
   building w/o BSP.

Change-Id: I01f661f1d1e038737801f5a9db88e3388d470f74
---
 BoardConfig.mk          |  4 ++++
 device.mk               |  8 ++++++++
 gps/batching/Android.mk |  3 +--
 gps/geofence/Android.mk |  3 +--
 proprietary-files.txt   | 11 -----------
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 706775a..e66b022 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -88,6 +88,10 @@ TARGET_QCOM_NO_FM_FIRMWARE := true
 # FOD
 TARGET_SURFACEFLINGER_FOD_LIB := //$(DEVICE_PATH):libfod_extension.davinci
 
+# GPS
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
+LOC_HIDL_VERSION := 3.0
+
 # HIDL
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml
diff --git a/device.mk b/device.mk
index 51ff0b9..f3ad365 100644
--- a/device.mk
+++ b/device.mk
@@ -157,6 +157,14 @@ PRODUCT_COPY_FILES += \
 
 # GPS
 PRODUCT_PACKAGES += \
+    android.hardware.gnss@2.0-impl-qti \
+    android.hardware.gnss@2.0-service-qti
+
+PRODUCT_PACKAGES += \
+    libbatching \
+    libgeofencing \
+    libgnss \
+    libgnsspps \
     libsensorndkbridge
 
 PRODUCT_COPY_FILES += \
diff --git a/gps/batching/Android.mk b/gps/batching/Android.mk
index b08d155..f32288c 100644
--- a/gps/batching/Android.mk
+++ b/gps/batching/Android.mk
@@ -15,8 +15,7 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libloc_core \
     libgps.utils \
-    libdl \
-    liblbs_core
+    libdl
 
 LOCAL_SRC_FILES += \
     location_batching.cpp \
diff --git a/gps/geofence/Android.mk b/gps/geofence/Android.mk
index 6e9e870..ec1a4a7 100644
--- a/gps/geofence/Android.mk
+++ b/gps/geofence/Android.mk
@@ -18,8 +18,7 @@ LOCAL_SHARED_LIBRARIES := \
         libcutils \
         libgps.utils \
         liblog \
-        libloc_core \
-        liblbs_core
+        libloc_core
 
 LOCAL_HEADER_LIBRARIES := \
     libgps.utils_headers \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index a4a5436..98c056a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -513,7 +513,6 @@ vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 
 # GPS
-vendor/bin/hw/android.hardware.gnss@2.0-service-qti
 vendor/bin/loc_launcher
 vendor/bin/lowi-server
 vendor/bin/slim_daemon
@@ -521,28 +520,18 @@ vendor/bin/xtra-daemon
 vendor/bin/xtwifi-client
 vendor/bin/xtwifi-inet-agent
 vendor/etc/cacert_location.pem
-vendor/etc/init/android.hardware.gnss@2.0-service-qti.rc
-vendor/etc/vintf/manifest/android.hardware.gnss@2.0-service-qti.xml
 vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml
 vendor/etc/xtra_root_cert.pem
-vendor/lib64/hw/android.hardware.gnss@2.0-impl-qti.so
 vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so
-vendor/lib64/libbatching.so
 vendor/lib64/libcacertclient.so
 vendor/lib64/libdataitems.so
 vendor/lib64/libgdtap.so
-vendor/lib64/libgeofencing.so
-vendor/lib64/libgnsspps.so
-vendor/lib64/libgnss.so
-vendor/lib64/libgps.utils.so
 vendor/lib64/libizat_client_api.so
 vendor/lib64/libizat_core.so
 vendor/lib64/liblbs_core.so
 vendor/lib64/libloc_api_v02.so
-vendor/lib64/liblocation_api.so
 vendor/lib64/liblocationservice_glue.so
 vendor/lib64/liblocationservice.so
-vendor/lib64/libloc_core.so
 vendor/lib64/libloc_socket.so
 vendor/lib64/liblowi_client.so
 vendor/lib64/liblowi_wifihal.so