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
This commit is contained in:
dianlujitao 2019-10-09 19:54:50 +08:00 committed by Arian
parent 4f4f8cd486
commit bf60c73d8e
No known key found for this signature in database
GPG Key ID: 48029380598CE3B9
5 changed files with 14 additions and 15 deletions

View File

@ -88,6 +88,10 @@ TARGET_QCOM_NO_FM_FIRMWARE := true
# FOD # FOD
TARGET_SURFACEFLINGER_FOD_LIB := //$(DEVICE_PATH):libfod_extension.davinci TARGET_SURFACEFLINGER_FOD_LIB := //$(DEVICE_PATH):libfod_extension.davinci
# GPS
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
LOC_HIDL_VERSION := 3.0
# HIDL # HIDL
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml

View File

@ -157,6 +157,14 @@ PRODUCT_COPY_FILES += \
# GPS # GPS
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.gnss@2.0-impl-qti \
android.hardware.gnss@2.0-service-qti
PRODUCT_PACKAGES += \
libbatching \
libgeofencing \
libgnss \
libgnsspps \
libsensorndkbridge libsensorndkbridge
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

View File

@ -15,8 +15,7 @@ LOCAL_SHARED_LIBRARIES := \
liblog \ liblog \
libloc_core \ libloc_core \
libgps.utils \ libgps.utils \
libdl \ libdl
liblbs_core
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
location_batching.cpp \ location_batching.cpp \

View File

@ -18,8 +18,7 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libgps.utils \ libgps.utils \
liblog \ liblog \
libloc_core \ libloc_core
liblbs_core
LOCAL_HEADER_LIBRARIES := \ LOCAL_HEADER_LIBRARIES := \
libgps.utils_headers \ libgps.utils_headers \

View File

@ -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 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
# GPS # GPS
vendor/bin/hw/android.hardware.gnss@2.0-service-qti
vendor/bin/loc_launcher vendor/bin/loc_launcher
vendor/bin/lowi-server vendor/bin/lowi-server
vendor/bin/slim_daemon vendor/bin/slim_daemon
@ -521,28 +520,18 @@ vendor/bin/xtra-daemon
vendor/bin/xtwifi-client vendor/bin/xtwifi-client
vendor/bin/xtwifi-inet-agent vendor/bin/xtwifi-inet-agent
vendor/etc/cacert_location.pem 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/vintf/manifest/vendor.qti.gnss@3.0-service.xml
vendor/etc/xtra_root_cert.pem 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/hw/vendor.qti.gnss@3.0-impl.so
vendor/lib64/libbatching.so
vendor/lib64/libcacertclient.so vendor/lib64/libcacertclient.so
vendor/lib64/libdataitems.so vendor/lib64/libdataitems.so
vendor/lib64/libgdtap.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_client_api.so
vendor/lib64/libizat_core.so vendor/lib64/libizat_core.so
vendor/lib64/liblbs_core.so vendor/lib64/liblbs_core.so
vendor/lib64/libloc_api_v02.so vendor/lib64/libloc_api_v02.so
vendor/lib64/liblocation_api.so
vendor/lib64/liblocationservice_glue.so vendor/lib64/liblocationservice_glue.so
vendor/lib64/liblocationservice.so vendor/lib64/liblocationservice.so
vendor/lib64/libloc_core.so
vendor/lib64/libloc_socket.so vendor/lib64/libloc_socket.so
vendor/lib64/liblowi_client.so vendor/lib64/liblowi_client.so
vendor/lib64/liblowi_wifihal.so vendor/lib64/liblowi_wifihal.so