From 5ce00344e5322de64b226b5bf779e8b3d769e723 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Fri, 6 Nov 2015 17:44:53 -0800 Subject: z2_plus: gps: Fix build for OSS builds gps: Correct forward declaration in proprietary definitions Fix gps runtime error The qcom prebuilt binary relies on FlpExtLocation_s, so we cannot change it to FlpExtLocation. This patch fixes it. gps: fix remove trailing space In setXtraUserAgent, size_t is unsigned and never being negative. Will cause segmentation fault, if string is all space. Change-Id: I1cf1f956943b0739640afe909954ade6921e28a1 --- gps/core/UlpProxyBase.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gps/core/UlpProxyBase.h') diff --git a/gps/core/UlpProxyBase.h b/gps/core/UlpProxyBase.h index 59e265e..efcf98a 100644 --- a/gps/core/UlpProxyBase.h +++ b/gps/core/UlpProxyBase.h @@ -30,7 +30,9 @@ #define ULP_PROXY_BASE_H #include -#include "fused_location_extended.h" + +struct FlpExtLocation_s; +struct FlpExtBatchOptions; namespace loc_core { @@ -73,7 +75,7 @@ public: bool active) { return false; } - inline virtual bool reportPositions(const FlpExtLocation* locations, + inline virtual bool reportPositions(const struct FlpExtLocation_s* locations, int32_t number_of_locations) { return false; } -- cgit v1.2.3