From 53b83fdea2026e5b14878791ef6538c1484781dd Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Sat, 26 Mar 2022 23:23:50 +0100 Subject: [PATCH] sm7325-common: location: update to LA.UM.9.12.r1-13500.01-SMxx50.QSSI12.0 --- location/Android.bp | 12 ++++++++++++ location/Android.mk | 7 ++++--- location/gnsspps/Android.bp | 2 ++ location/gps_vendor_product.mk | 6 +++++- location/loc_api/loc_api_v02/Android.mk | 1 + location/loc_api/loc_api_v02/LocApiV02.cpp | 8 +------- .../src/LocationApiPbMsgConv.cpp | 2 +- location/synergy_loc_api/Android.mk | 1 + location/utils/loc_socket/Android.mk | 1 + 9 files changed, 28 insertions(+), 12 deletions(-) diff --git a/location/Android.bp b/location/Android.bp index 0681f67..ea0d991 100644 --- a/location/Android.bp +++ b/location/Android.bp @@ -16,6 +16,18 @@ GNSS_CFLAGS = [ "-Wno-error=date-time", ] +/* Activate the following for regression testing */ +GNSS_SANITIZE = { +/* address: true,*/ + cfi: true, + misc_undefined: [ + "bounds", + "null", + "unreachable", + "integer", + ], +} + /* Activate the following for debug purposes only, comment out for production */ GNSS_SANITIZE_DIAG = { diff --git a/location/Android.mk b/location/Android.mk index 30e4eee..c572a06 100644 --- a/location/Android.mk +++ b/location/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH := $(call my-dir) - -GNSS_SANITIZE_DIAG := cfi bounds null unreachable integer address - include $(call all-makefiles-under,$(LOCAL_PATH)) +GNSS_SANITIZE := cfi bounds null unreachable integer +# Activate the following two lines for regression testing +# GNSS_SANITIZE += address +# GNSS_SANITIZE_DIAG := $(GNSS_SANITIZE) diff --git a/location/gnsspps/Android.bp b/location/gnsspps/Android.bp index 84efb8e..62ebe34 100644 --- a/location/gnsspps/Android.bp +++ b/location/gnsspps/Android.bp @@ -4,6 +4,8 @@ cc_library_shared { name: "libgnsspps", vendor: true, + sanitize: GNSS_SANITIZE, + shared_libs: [ "libutils", "libcutils", diff --git a/location/gps_vendor_product.mk b/location/gps_vendor_product.mk index 874475b..eb1b0a3 100644 --- a/location/gps_vendor_product.mk +++ b/location/gps_vendor_product.mk @@ -1,6 +1,10 @@ # vendor opensource packages ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),) +# Activate the following two lines for regression testing +#GNSS_SANITIZE := address cfi alignment bounds null unreachable integer +#GNSS_SANITIZE_DIAG := address cfi alignment bounds null unreachable integer + # Add product packages #add QMI libraries for QMI targets LOC_BOARD_PLATFORM_LIST += msm8953 @@ -16,7 +20,7 @@ LOC_BOARD_PLATFORM_LIST += msmnile LOC_BOARD_PLATFORM_LIST += sdmshrike LOC_BOARD_PLATFORM_LIST += $(MSMSTEPPE) LOC_BOARD_PLATFORM_LIST += $(TRINKET) -LOC_BOARD_PLATFORM_LIST += lahaina +LOC_BOARD_PLATFORM_LIST += kona LOC_BOARD_PLATFORM_LIST += lito LOC_BOARD_PLATFORM_LIST += bengal LOC_BOARD_PLATFORM_LIST += atoll diff --git a/location/loc_api/loc_api_v02/Android.mk b/location/loc_api/loc_api_v02/Android.mk index 338b0f2..267cd46 100644 --- a/location/loc_api/loc_api_v02/Android.mk +++ b/location/loc_api/loc_api_v02/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_api_v02 +LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib diff --git a/location/loc_api/loc_api_v02/LocApiV02.cpp b/location/loc_api/loc_api_v02/LocApiV02.cpp index 15c8258..3f35ded 100644 --- a/location/loc_api/loc_api_v02/LocApiV02.cpp +++ b/location/loc_api/loc_api_v02/LocApiV02.cpp @@ -961,8 +961,6 @@ void LocApiV02 :: (time_info_current.tv_nsec)/1e6; } - //Use this bit to indicate the injected position source is NLP - location.techMask |= LOCATION_TECHNOLOGY_WIFI_BIT; injectPosition(location, onDemandCpi); } @@ -1017,11 +1015,7 @@ void LocApiV02::injectPosition(const Location& location, bool onDemandCpi) } injectPositionReq.positionSrc_valid = 1; - if (LOCATION_TECHNOLOGY_WIFI_BIT & location.techMask) { - injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_WIFI_V02; - } else { - injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_OTHER_V02; - } + injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_OTHER_V02; if (onDemandCpi) { injectPositionReq.onDemandCpi_valid = 1; diff --git a/location/location_api_msg_proto/src/LocationApiPbMsgConv.cpp b/location/location_api_msg_proto/src/LocationApiPbMsgConv.cpp index fabf359..1e40ab3 100644 --- a/location/location_api_msg_proto/src/LocationApiPbMsgConv.cpp +++ b/location/location_api_msg_proto/src/LocationApiPbMsgConv.cpp @@ -4361,7 +4361,7 @@ int LocationApiPbMsgConv::pbConvertToLocation(const PBLocation &pbLoc, Location loc.bearingAccuracy = pbLoc.bearingaccuracy(); // uint32 techMask = 12; - bitwise OR of PBLocationTechnologyMask - loc.techMask = getLocationTechnologyMaskFromPB(pbLoc.techmask()); + loc.techMask = getLocationFlagsMaskFromPB(pbLoc.techmask()); LOC_LOGd("LocApiPB: pbLoc - Timestamp: %" PRIu64" Lat:%lf, Lon:%lf, Alt:%lf, TechMask:%x", loc.timestamp, loc.latitude, loc.longitude, loc.altitude, loc.techMask); diff --git a/location/synergy_loc_api/Android.mk b/location/synergy_loc_api/Android.mk index f22adf3..a2f819c 100644 --- a/location/synergy_loc_api/Android.mk +++ b/location/synergy_loc_api/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libsynergy_loc_api +LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/location/utils/loc_socket/Android.mk b/location/utils/loc_socket/Android.mk index 1f9c1d9..e413bde 100644 --- a/location/utils/loc_socket/Android.mk +++ b/location/utils/loc_socket/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_socket +LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib