diff options
author | Satheesh Jayakumar <sjayakum@codeaurora.org> | 2013-05-07 09:31:48 -0700 |
---|---|---|
committer | Satheesh Jayakumar <sjayakum@codeaurora.org> | 2013-07-03 17:12:46 -0700 |
commit | fed389ab357f49778070b554bfbf254411093c75 (patch) | |
tree | a017e9f572e264e9a2678cb78afb31945aa040b9 | |
parent | 207b8ee9a5303239f8275f1317e894cd67ca170d (diff) | |
download | gps-fed389ab357f49778070b554bfbf254411093c75.tar.gz |
GARDEn: porting LE enhancement to Android - fix build error
Add platform abstraction layer into include path
Change-Id: I1e27a60f3afcc259449d264697bd39c03ef9609f
-rw-r--r-- | loc_api/libloc_api_50001/Android.mk | 2 | ||||
-rw-r--r-- | loc_api/libloc_api_50001/loc_eng_xtra.cpp | 3 | ||||
-rw-r--r-- | utils/Android.mk | 13 |
3 files changed, 12 insertions, 6 deletions
diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk index c9bef52..6bf0530 100644 --- a/loc_api/libloc_api_50001/Android.mk +++ b/loc_api/libloc_api_50001/Android.mk @@ -32,7 +32,7 @@ LOCAL_CFLAGS += -DFEATURE_DELEXT endif #FEATURE_DELEXT LOCAL_C_INCLUDES:= \ - $(TARGET_OUT_HEADERS)/gps.utils + $(TARGET_OUT_HEADERS)/gps.utils \ LOCAL_COPY_HEADERS_TO:= libloc_eng/ LOCAL_COPY_HEADERS:= \ diff --git a/loc_api/libloc_api_50001/loc_eng_xtra.cpp b/loc_api/libloc_api_50001/loc_eng_xtra.cpp index 9262cb0..d8c7226 100644 --- a/loc_api/libloc_api_50001/loc_eng_xtra.cpp +++ b/loc_api/libloc_api_50001/loc_eng_xtra.cpp @@ -59,8 +59,7 @@ int loc_eng_xtra_init (loc_eng_data_s_type &loc_eng_data, if(callbacks == NULL) { LOC_LOGE("loc_eng_xtra_init: failed, cb is NULL"); - } - else { + } else { xtra_module_data_ptr = &loc_eng_data.xtra_module_data; xtra_module_data_ptr->download_request_cb = callbacks->download_request_cb; ret_val = 0; diff --git a/utils/Android.mk b/utils/Android.mk index 57f636f..418f00d 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -17,7 +17,9 @@ LOCAL_SRC_FILES += \ msg_q.c \ linked_list.c \ loc_target.cpp \ - loc_timer.c + loc_timer.c \ + ../platform_lib_abstractions/elapsed_millis_since_boot.cpp + LOCAL_CFLAGS += \ -fno-short-enums \ @@ -26,7 +28,8 @@ LOCAL_CFLAGS += \ LOCAL_LDFLAGS += -Wl,--export-dynamic ## Includes -LOCAL_C_INCLUDES:= +LOCAL_C_INCLUDES:= \ + $(LOCAL_PATH)/../platform_lib_abstractions LOCAL_COPY_HEADERS_TO:= gps.utils/ LOCAL_COPY_HEADERS:= \ @@ -36,7 +39,11 @@ LOCAL_COPY_HEADERS:= \ linked_list.h \ msg_q.h \ loc_target.h \ - loc_timer.h + loc_timer.h \ + ../platform_lib_abstractions/platform_lib_includes.h \ + ../platform_lib_abstractions/platform_lib_time.h \ + ../platform_lib_abstractions/platform_lib_macros.h + LOCAL_MODULE := libgps.utils |