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

Merge "LOC: Enable loc_eng_dmn_conn_loc_api_server for all targets"

Browse source
This commit is contained in:
Linux Build Service Account 2013-01-28 13:26:08 -08:00 committed by Gerrit - the friendly Code Review server
commit b19e73a479
2 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
loc_api/libloc_api_50001/Android.mk Normal file → Executable file
View file

@ -1,13 +1,6 @@
ifneq ($(BUILD_TINY_ANDROID),true) ifneq ($(BUILD_TINY_ANDROID),true)
#Compile this library only for builds with the latest modem image #Compile this library only for builds with the latest modem image
BIT_ENABLED_BOARD_PLATFORM_LIST := msm7630_fusion
BIT_ENABLED_BOARD_PLATFORM_LIST += msm8660
BIT_ENABLED_BOARD_PLATFORM_LIST += msm8960
ifeq ($(call is-board-platform-in-list,$(BIT_ENABLED_BOARD_PLATFORM_LIST)),true)
FEATURE_GNSS_BIT_API := true
endif # is-board-platform-in-list
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -81,10 +74,6 @@ LOCAL_SRC_FILES += \
loc_eng_log.cpp \ loc_eng_log.cpp \
loc_eng_nmea.cpp loc_eng_nmea.cpp
ifeq ($(FEATURE_GNSS_BIT_API), true)
LOCAL_CFLAGS += -DFEATURE_GNSS_BIT_API
endif # FEATURE_GNSS_BIT_API
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
loc_eng_dmn_conn.cpp \ loc_eng_dmn_conn.cpp \
loc_eng_dmn_conn_handler.cpp \ loc_eng_dmn_conn_handler.cpp \

23
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -491,17 +491,8 @@ void loc_eng_cleanup(loc_eng_data_s_type &loc_eng_data)
loc_eng_data.client_handle = NULL; loc_eng_data.client_handle = NULL;
} }
#ifdef FEATURE_GNSS_BIT_API
{
char baseband[PROPERTY_VALUE_MAX];
property_get("ro.baseband", baseband, "msm");
if ((strcmp(baseband,"svlte2a") == 0))
{
loc_eng_dmn_conn_loc_api_server_unblock(); loc_eng_dmn_conn_loc_api_server_unblock();
loc_eng_dmn_conn_loc_api_server_join(); loc_eng_dmn_conn_loc_api_server_join();
}
}
#endif /* FEATURE_GNSS_BIT_API */
#endif #endif
@ -899,22 +890,8 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsCallbacks* callbac
true); true);
#endif #endif
#ifdef FEATURE_GNSS_BIT_API
{
char baseband[PROPERTY_VALUE_MAX];
property_get("ro.baseband", baseband, "msm");
if ((strcmp(baseband,"svlte2a") == 0) ||
(strcmp(baseband,"sglte") == 0) ||
(strcmp(baseband,"msm") == 0))
{
loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb, loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb,
NULL, NULL, &loc_eng_data); NULL, NULL, &loc_eng_data);
} else {
LOC_LOGD("%s:%d] loc_eng_dmn_conn_loc_api_server was not initialized.baseband = %s\n",
__func__, __LINE__, baseband);
}
}
#endif /* FEATURE_GNSS_BIT_API */
loc_eng_agps_reinit(loc_eng_data); loc_eng_agps_reinit(loc_eng_data);
EXIT_LOG(%s, VOID_RET); EXIT_LOG(%s, VOID_RET);