commit de7700cdd74e38f7bc856af69c2feb80b2277d70
author Mike Cailean <mcailean@codeaurora.org> Mon Apr 11 17:08:48 2016 -0700
committer Steve Pfetsch <spfetsch@google.com> Mon May 16 15:23:17 2016 -0700
tree 814fce2da159eead7a0656b767ed1df4ffcbb5c1
parent 7fd74c908ee91725086c0ffb98a024a6695d871d

Remove problematic dependency

Removed the inclusion of a header file in UlpProxyBase.h
and moved two functions out of UlpProxyBase class

Change-Id: I858613ffbb0b8072056ccb7d1192d7681bf08c3c

msm8996/core/Android.mk

diff --git a/msm8996/core/Android.mk b/msm8996/core/Android.mk
index 2c8fadc..4381555 100644
--- a/msm8996/core/Android.mk
+++ b/msm8996/core/Android.mk
@@ -35,8 +35,7 @@
      -Wno-unused-parameter
 
 LOCAL_C_INCLUDES:= \
-    $(TARGET_OUT_HEADERS)/gps.utils \
-    $(TARGET_OUT_HEADERS)/libflp
+    $(TARGET_OUT_HEADERS)/gps.utils
 
 LOCAL_COPY_HEADERS_TO:= libloc_core/
 LOCAL_COPY_HEADERS:= \

msm8996/core/UlpProxyBase.h

diff --git a/msm8996/core/UlpProxyBase.h b/msm8996/core/UlpProxyBase.h
index cb169a5..7e3c4be 100644
--- a/msm8996/core/UlpProxyBase.h
+++ b/msm8996/core/UlpProxyBase.h
@@ -30,7 +30,6 @@
 #define ULP_PROXY_BASE_H
 
 #include <gps_extended.h>
-#include "fused_location_extended.h"
 
 namespace loc_core {
 
@@ -69,14 +68,6 @@
     }
     inline virtual void setAdapter(LocAdapterBase* adapter) {}
     inline virtual void setCapabilities(unsigned long capabilities) {}
-    inline virtual bool reportBatchingSession(FlpExtBatchOptions &options,
-        bool active) {
-        return false;
-    }
-    inline virtual bool reportPositions(const FlpExtLocation* locations,
-                                        int32_t number_of_locations) {
-        return false;
-    }
 };
 
 } // namespace loc_core