gps: Fix build for all build types

Change-Id: I3d78d7c3e09962874efea7b9358e2e281356bf11

gps/core/Android.mk

@@ -15,6 +15,10 @@ else ifeq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET),true)
 LOCAL_CFLAGS += -DPDK_FEATURE_SET
 endif
 
+ifeq ($(QCPATH),)
+LOCAL_CFLAGS += -DOSS_BUILD
+endif
+
 LOCAL_SHARED_LIBRARIES := \
     libutils \
     libcutils \

gps/core/UlpProxyBase.h

@@ -30,12 +30,16 @@
 #define ULP_PROXY_BASE_H
 
 #include <gps_extended.h>
+#ifndef OSS_BUILD
+#include "fused_location_extended.h"
+#else
+struct FlpExtLocation;
+struct FlpExtBatchOptions;
+#endif
 
 namespace loc_core {
 
 class LocAdapterBase;
-class FlpExtLocation;
-class FlpExtBatchOptions;
 
 class UlpProxyBase {
 public:

gps/loc_api/libloc_api_50001/Android.mk

@@ -38,6 +38,10 @@ LOCAL_CFLAGS += \
      -fno-short-enums \
      -D_ANDROID_
 
+ifeq ($(QCPATH),)
+LOCAL_CFLAGS += -DOSS_BUILD
+endif
+
 LOCAL_C_INCLUDES:= \
     $(TARGET_OUT_HEADERS)/gps.utils \
     $(TARGET_OUT_HEADERS)/libloc_core \
@@ -92,6 +96,10 @@ ifeq ($(TARGET_USES_QCOM_BSP), true)
 LOCAL_CFLAGS += -DTARGET_USES_QCOM_BSP
 endif
 
+ifeq ($(QCPATH),)
+LOCAL_CFLAGS += -DOSS_BUILD
+endif
+
 ## Includes
 LOCAL_C_INCLUDES:= \
     $(TARGET_OUT_HEADERS)/gps.utils \