resolve merge conflicts of e7c98642e1 to master.
Change-Id: I2c5ea4dd04c3a3048889d1fea07101f6405ae2b3
diff --git a/Android.mk b/Android.mk
index 1535d65..fc79df1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,29 +1,34 @@
-ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
-LOCAL_PATH := $(call my-dir)
+# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
+ifneq ($(TARGET_BOARD_AUTO),true)
+ ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
+ LOCAL_PATH := $(call my-dir)
-ifeq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET),true)
+ ifeq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET),true)
-ifneq ($(filter msm8960 apq8064 ,$(TARGET_BOARD_PLATFORM)),)
- #For msm8960/apq8064 targets
- include $(call all-named-subdir-makefiles,msm8960)
-else ifneq ($(filter msm8974 ,$(TARGET_BOARD_PLATFORM)),)
- #For msm8974 target
- include $(call all-named-subdir-makefiles,msm8974)
-else ifneq ($(filter msm8084 ,$(TARGET_BOARD_PLATFORM)),)
- #For msm8084 target
- include $(call all-named-subdir-makefiles,msm8084)
-else ifeq ($(filter msm8916,$(TARGET_BOARD_PLATFORM)),)
- #For all other targets
- GPS_DIRS=core utils loc_api platform_lib_abstractions etc
- include $(call all-named-subdir-makefiles,$(GPS_DIRS))
-endif #TARGET_BOARD_PLATFORM
+ ifneq ($(filter msm8960 apq8064 ,$(TARGET_BOARD_PLATFORM)),)
+ #For msm8960/apq8064 targets
+ include $(call all-named-subdir-makefiles,msm8960)
+ else ifneq ($(filter msm8974 ,$(TARGET_BOARD_PLATFORM)),)
+ #For msm8974 target
+ include $(call all-named-subdir-makefiles,msm8974)
+ else ifneq ($(filter msm8084 ,$(TARGET_BOARD_PLATFORM)),)
+ #For msm8084 target
+ include $(call all-named-subdir-makefiles,msm8084)
+ else ifeq ($(filter msm8916,$(TARGET_BOARD_PLATFORM)),)
+ #For all other targets
+ GPS_DIRS=core utils loc_api platform_lib_abstractions etc
+ include $(call all-named-subdir-makefiles,$(GPS_DIRS))
+ endif #TARGET_BOARD_PLATFORM
-else ifneq ($(filter msm8909 ,$(TARGET_BOARD_PLATFORM)),)
- #For msm8909 target
- include $(call all-named-subdir-makefiles,msm8909)
-else ifeq ($(filter msm8916 ,$(TARGET_BOARD_PLATFORM)),)
- GPS_DIRS=core utils loc_api platform_lib_abstractions etc
- include $(call all-named-subdir-makefiles,$(GPS_DIRS))
-endif #BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET
+ else
+ ifneq ($(filter msm8909 ,$(TARGET_BOARD_PLATFORM)),)
+ #For msm8909 target
+ include $(call all-named-subdir-makefiles,msm8909)
+ else ifeq ($(filter msm8916 ,$(TARGET_BOARD_PLATFORM)),)
+ GPS_DIRS=core utils loc_api platform_lib_abstractions etc
+ include $(call all-named-subdir-makefiles,$(GPS_DIRS))
+ endif
+ endif #BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET
-endif #BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
+ endif #BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
+endif
diff --git a/msm8974/loc_api/libloc_api_50001/loc.cpp b/msm8974/loc_api/libloc_api_50001/loc.cpp
index 028b71e..f6630d5 100644
--- a/msm8974/loc_api/libloc_api_50001/loc.cpp
+++ b/msm8974/loc_api/libloc_api_50001/loc.cpp
@@ -954,7 +954,11 @@
static int loc_xtra_init(GpsXtraCallbacks* callbacks)
{
ENTRY_LOG();
- int ret_val = loc_eng_xtra_init(loc_afw_data, (GpsXtraExtCallbacks*)callbacks);
+ GpsXtraExtCallbacks ext_callbacks;
+ ext_callbacks.download_request_cb = callbacks->download_request_cb;
+ ext_callbacks.create_thread_cb = callbacks->create_thread_cb;
+ ext_callbacks.report_xtra_server_cb = NULL;
+ int ret_val = loc_eng_xtra_init(loc_afw_data, &ext_callbacks);
EXIT_LOG(%d, ret_val);
return ret_val;
diff --git a/msm8974/utils/loc_cfg.cpp b/msm8974/utils/loc_cfg.cpp
index 7030121..ab15d3b 100644
--- a/msm8974/utils/loc_cfg.cpp
+++ b/msm8974/utils/loc_cfg.cpp
@@ -52,8 +52,8 @@
*============================================================================*/
/* Parameter data */
-static uint8_t DEBUG_LEVEL = 0xff;
-static uint8_t TIMESTAMP = 0;
+static int DEBUG_LEVEL = 0xff;
+static int TIMESTAMP = 0;
/* Parameter spec table */
static loc_param_s_type loc_param_table[] =