diff options
| author | Dante Russo <drusso@codeaurora.org> | 2014-06-27 13:15:00 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-07-08 16:46:43 -0700 |
| commit | d500f4f20ef5cfab9524f85c37987715447a0428 (patch) | |
| tree | 4bd20371bb8a837665f468923ddca5589afc901b /loc_api | |
| parent | 8a20422ef3c5739869ca2e23d85fb9a88be9b64b (diff) | |
| download | gps-d500f4f20ef5cfab9524f85c37987715447a0428.tar.gz | |
Add conditional compilation for libmdmdetect
Since libmdmdetect is not present for all
targets/branches, the code is conditionally
compiled to check if it is present
Change-Id: I81dec1020d701ce12e6fecb443d7eb510efe31a1
Diffstat (limited to 'loc_api')
| -rw-r--r-- | loc_api/libloc_api_50001/Android.mk | 14 | ||||
| -rw-r--r-- | loc_api/libloc_api_50001/loc.cpp | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk index 8f5d389..ca0e516 100644 --- a/loc_api/libloc_api_50001/Android.mk +++ b/loc_api/libloc_api_50001/Android.mk @@ -74,8 +74,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libmdmdetect + libdl LOCAL_SRC_FILES += \ loc.cpp \ @@ -83,7 +82,7 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS += \ -fno-short-enums \ - -D_ANDROID_ \ + -D_ANDROID_ ifeq ($(TARGET_USES_QCOM_BSP), true) LOCAL_CFLAGS += -DTARGET_USES_QCOM_BSP @@ -92,8 +91,13 @@ endif ## Includes LOCAL_C_INCLUDES:= \ $(TARGET_OUT_HEADERS)/gps.utils \ - $(TARGET_OUT_HEADERS)/libloc_core \ - $(TARGET_OUT_HEADERS)/libmdmdetect/inc + $(TARGET_OUT_HEADERS)/libloc_core + +ifneq ($(filter msm8084,$(TARGET_BOARD_PLATFORM)),) + LOCAL_SHARED_LIBRARIES += libmdmdetect + LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libmdmdetect/inc + LOCAL_CFLAGS += -DPLATFORM_MSM8084 +endif LOCAL_PRELINK_MODULE := false LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw diff --git a/loc_api/libloc_api_50001/loc.cpp b/loc_api/libloc_api_50001/loc.cpp index 6e50abe..36171f3 100644 --- a/loc_api/libloc_api_50001/loc.cpp +++ b/loc_api/libloc_api_50001/loc.cpp @@ -44,6 +44,8 @@ #include <errno.h> #include <LocDualContext.h> #include <cutils/properties.h> + +#ifdef PLATFORM_MSM8084 #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -51,6 +53,7 @@ extern "C" { #ifdef __cplusplus } #endif /* __cplusplus */ +#endif /*PLATFORM_MSM8084*/ using namespace loc_core; //Globals defns @@ -299,6 +302,8 @@ static int loc_init(GpsCallbacks* callbacks) loc_afw_data.adapter->setPowerVote(true); LOC_LOGD("loc_eng_init() success!"); + +#ifdef PLATFORM_MSM8084 if (mdm_fd < 0) { struct dev_info modem_info; memset(&modem_info, 0, sizeof(struct dev_info)); @@ -328,7 +333,7 @@ static int loc_init(GpsCallbacks* callbacks) } else { LOC_LOGD("powerup_node has been opened before"); } - +#endif //PLATFORM_MSM8084 err: EXIT_LOG(%d, retVal); return retVal; |