MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "GARDEn: porting LE enhancement to Android - fix build error"

Browse source
This commit is contained in:
Linux Build Service Account 2013-07-09 05:27:10 -07:00 committed by Gerrit - the friendly Code Review server
commit d8c914cddc
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
loc_api/libloc_api_50001/Android.mk
View file

@ -32,7 +32,7 @@ LOCAL_CFLAGS += -DFEATURE_DELEXT
endif #FEATURE_DELEXT endif #FEATURE_DELEXT
LOCAL_C_INCLUDES:= \ LOCAL_C_INCLUDES:= \
$(TARGET_OUT_HEADERS)/gps.utils $(TARGET_OUT_HEADERS)/gps.utils \
LOCAL_COPY_HEADERS_TO:= libloc_eng/ LOCAL_COPY_HEADERS_TO:= libloc_eng/
LOCAL_COPY_HEADERS:= \ LOCAL_COPY_HEADERS:= \

3
loc_api/libloc_api_50001/loc_eng_xtra.cpp
View file

@ -59,8 +59,7 @@ int loc_eng_xtra_init (loc_eng_data_s_type &loc_eng_data,
if(callbacks == NULL) { if(callbacks == NULL) {
LOC_LOGE("loc_eng_xtra_init: failed, cb is 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 = &loc_eng_data.xtra_module_data;
xtra_module_data_ptr->download_request_cb = callbacks->download_request_cb; xtra_module_data_ptr->download_request_cb = callbacks->download_request_cb;
ret_val = 0; ret_val = 0;

13
utils/Android.mk
View file

@ -17,7 +17,9 @@ LOCAL_SRC_FILES += \
msg_q.c \ msg_q.c \
linked_list.c \ linked_list.c \
loc_target.cpp \ loc_target.cpp \
loc_timer.c loc_timer.c \
../platform_lib_abstractions/elapsed_millis_since_boot.cpp
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-fno-short-enums \ -fno-short-enums \
@ -26,7 +28,8 @@ LOCAL_CFLAGS += \
LOCAL_LDFLAGS += -Wl,--export-dynamic LOCAL_LDFLAGS += -Wl,--export-dynamic
## Includes ## Includes
LOCAL_C_INCLUDES:= LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../platform_lib_abstractions
LOCAL_COPY_HEADERS_TO:= gps.utils/ LOCAL_COPY_HEADERS_TO:= gps.utils/
LOCAL_COPY_HEADERS:= \ LOCAL_COPY_HEADERS:= \
@ -36,7 +39,11 @@ LOCAL_COPY_HEADERS:= \
linked_list.h \ linked_list.h \
msg_q.h \ msg_q.h \
loc_target.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 LOCAL_MODULE := libgps.utils