diff options
| author | Ethan Chen <intervigil@gmail.com> | 2015-11-06 17:44:53 -0800 |
|---|---|---|
| committer | Arvin Quilao <arquilao@gmail.com> | 2015-12-17 12:30:18 +0800 |
| commit | 50cf4c7e4e74f9a1797c7eecd582838f8b58731b (patch) | |
| tree | cb11beb2ca2280645c33a925de3c0cb503456c5f /gps | |
| parent | 1bba97e484ec5e5030b6acfe78f3ec940e7d18df (diff) | |
gps: Fix build for all build types
Change-Id: I3d78d7c3e09962874efea7b9358e2e281356bf11
Diffstat (limited to 'gps')
| -rw-r--r-- | gps/core/Android.mk | 4 | ||||
| -rw-r--r-- | gps/core/UlpProxyBase.h | 8 | ||||
| -rw-r--r-- | gps/loc_api/libloc_api_50001/Android.mk | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gps/core/Android.mk b/gps/core/Android.mk index 35a267f..fdbc534 100644 --- a/gps/core/Android.mk +++ b/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 \ diff --git a/gps/core/UlpProxyBase.h b/gps/core/UlpProxyBase.h index 0a2ff0e..0d9dd4c 100644 --- a/gps/core/UlpProxyBase.h +++ b/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: diff --git a/gps/loc_api/libloc_api_50001/Android.mk b/gps/loc_api/libloc_api_50001/Android.mk index e03aeca..4a1bdcc 100644 --- a/gps/loc_api/libloc_api_50001/Android.mk +++ b/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 \ |