summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2019-10-09 19:54:50 +0800
committerMichael Bestas <mkbestas@lineageos.org>2020-04-30 00:48:54 +0300
commitd505ac2a30ee8e5a17ee69556207a41a2526901c (patch)
treefb5c80be4d3ce0d8e57c08cb9b57b448efef3d6a
parent244d72ee13bec63cbd7f32b8ea9b60e87095adb0 (diff)
sdm660-common: Build new 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
-rw-r--r--BoardConfigCommon.mk4
-rw-r--r--gps/batching/Android.mk3
-rw-r--r--gps/geofence/Android.mk3
-rw-r--r--sdm660.mk10
4 files changed, 10 insertions, 10 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ba77a59..ce3b599 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -145,8 +145,8 @@ BOARD_HAS_QCA_FM_SOC := cherokee
BOARD_HAVE_QCOM_FM := true
# GPS
-USE_DEVICE_SPECIFIC_GPS := true
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
+LOC_HIDL_VERSION := 3.0
# HIDL
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/configs/manifests/vendor_framework_compatibility_matrix.xml
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/sdm660.mk b/sdm660.mk
index 949eaed..a57651a 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -234,11 +234,13 @@ PRODUCT_ODM_PROPERTIES += \
# GPS / Location
PRODUCT_PACKAGES += \
- android.hardware.gnss@1.0-impl-qti \
- android.hardware.gnss@1.0-service-qti \
+ android.hardware.gnss@2.0-impl-qti \
+ android.hardware.gnss@2.0-service-qti \
+ libbatching \
+ libgeofencing \
libgnss \
- libgnsspps \
- libsensorndkbridge
+ libsensorndkbridge \
+ libwifi-hal-ctrl
PRODUCT_COPY_FILES += \
$(COMMON_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \