From e03abb4da80c05a4c4f4b9e680ab43996daff8cb Mon Sep 17 00:00:00 2001
From: Amol Mahesh <amahesh@codeaurora.org>
Date: Thu, 24 Jan 2013 14:32:42 -0800
Subject: [PATCH] LOC: Enable loc_eng_dmn_conn_loc_api_server for all targets

Enable loc_eng_dmn_conn_loc_api_server for all targets irrespective
of the ro.baseband property.

Change-Id: Ieb9e505f27d0fc7abf4a94bac64dee60cccc4302
---
 loc_api/libloc_api_50001/Android.mk  | 11 -----------
 loc_api/libloc_api_50001/loc_eng.cpp | 29 +++-------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
 mode change 100644 => 100755 loc_api/libloc_api_50001/Android.mk

diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk
old mode 100644
new mode 100755
index 97f0488d..3ea5e918
--- a/loc_api/libloc_api_50001/Android.mk
+++ b/loc_api/libloc_api_50001/Android.mk
@@ -1,13 +1,6 @@
 ifneq ($(BUILD_TINY_ANDROID),true)
 #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)
 
 include $(CLEAR_VARS)
@@ -81,10 +74,6 @@ LOCAL_SRC_FILES += \
     loc_eng_log.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 += \
     loc_eng_dmn_conn.cpp \
     loc_eng_dmn_conn_handler.cpp \
diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp
index f2cbb699..5c37cbb6 100644
--- a/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/loc_api/libloc_api_50001/loc_eng.cpp
@@ -491,17 +491,8 @@ void loc_eng_cleanup(loc_eng_data_s_type &loc_eng_data)
         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_join();
-        }
-    }
-#endif /* FEATURE_GNSS_BIT_API */
+    loc_eng_dmn_conn_loc_api_server_unblock();
+    loc_eng_dmn_conn_loc_api_server_join();
 
 #endif
 
@@ -899,22 +890,8 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsCallbacks* callbac
                                                  true);
 #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);
-        } 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);
     EXIT_LOG(%s, VOID_RET);