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

1 files changed, 4 insertions, 2 deletions

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 <gps_extended.h>
-#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;
     }