Merge "make location.lnx.5.0 build for LE"

android/1.0/Android.mk

@@ -71,6 +71,7 @@ LOCAL_SHARED_LIBRARIES := \
     libdl \
     libbase \
     libutils \
+    libgps.utils \
     libqti_vndfwk_detect \
 
 LOCAL_SHARED_LIBRARIES += \

android/1.0/service.cpp

@@ -23,6 +23,7 @@
 #include <android/hardware/gnss/1.0/IGnss.h>
 #include <hidl/LegacySupport.h>
 
+#include "loc_cfg.h"
 extern "C" {
 #include "vndfwk-detect.h"
 }
@@ -31,7 +32,10 @@ using android::hardware::gnss::V1_0::IGnss;
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
-    if (!isRunningWithVendorEnhancedFramework()) {
+    bool vendorEnhanced = isRunningWithVendorEnhancedFramework();
+    setVendorEnhanced(vendorEnhanced);
+
+    if (!vendorEnhanced) {
         return defaultPassthroughServiceImplementation<IGnss>();
     } else {
         return -1;

android/1.1/Android.mk

@@ -72,6 +72,7 @@ LOCAL_SHARED_LIBRARIES := \
     libdl \
     libbase \
     libutils \
+    libgps.utils \
     libqti_vndfwk_detect \
 
 LOCAL_SHARED_LIBRARIES += \

android/1.1/service.cpp

@@ -23,6 +23,7 @@
 #include <android/hardware/gnss/1.1/IGnss.h>
 #include <hidl/LegacySupport.h>
 
+#include "loc_cfg.h"
 extern "C" {
 #include "vndfwk-detect.h"
 }
@@ -31,7 +32,10 @@ using android::hardware::gnss::V1_1::IGnss;
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
-    if (!isRunningWithVendorEnhancedFramework()) {
+    bool vendorEnhanced = isRunningWithVendorEnhancedFramework();
+    setVendorEnhanced(vendorEnhanced);
+
+    if (!vendorEnhanced) {
         return defaultPassthroughServiceImplementation<IGnss>();
     } else {
         return -1;

utils/Android.mk

@@ -11,8 +11,7 @@ include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := \
     libutils \
     libcutils \
-    liblog \
+    liblog
-    libqti_vndfwk_detect
 
 LOCAL_SRC_FILES += \
     loc_log.cpp \

utils/loc_cfg.cpp

@@ -48,10 +48,6 @@
 #endif
 #include "log_util.h"
 
-extern "C" {
-#include "vndfwk-detect.h"
-}
-
 /*=============================================================================
  *
  *                          GLOBAL DATA DECLARATION
@@ -62,6 +58,7 @@ extern "C" {
 static uint32_t DEBUG_LEVEL = 0xff;
 static uint32_t TIMESTAMP = 0;
 static uint32_t DATUM_TYPE = 0;
+static bool sVendorEnhanced = true;
 
 /* Parameter spec table */
 static const loc_param_s_type loc_param_table[] =
@@ -91,6 +88,13 @@ const char LOC_PATH_APDR_CONF[] = LOC_PATH_APDR_CONF_STR;
 const char LOC_PATH_XTWIFI_CONF[] = LOC_PATH_XTWIFI_CONF_STR;
 const char LOC_PATH_QUIPC_CONF[] = LOC_PATH_QUIPC_CONF_STR;
 
+bool isVendorEnhanced() {
+    return sVendorEnhanced;
+}
+void setVendorEnhanced(bool vendorEnhanced) {
+    sVendorEnhanced = vendorEnhanced;
+}
+
 /*===========================================================================
 FUNCTION loc_get_datum_type
 
@@ -764,8 +768,7 @@ int loc_read_process_conf(const char* conf_file_name, uint32_t * process_count_p
             continue;
         }
 
-        if ((isRunningWithVendorEnhancedFramework() && conf.vendor_enhanced_process == 0) ||
+        if (isVendorEnhanced() != conf.vendor_enhanced_process != 0) {
-                (!isRunningWithVendorEnhancedFramework() && conf.vendor_enhanced_process != 0)) {
             LOC_LOGD("%s:%d]: Process %s is disabled via vendor enhanced process check",
                      __func__, __LINE__, conf.proc_name);
             child_proc[j].proc_status = DISABLED_VIA_VENDOR_ENHANCED_CHECK;

utils/loc_cfg.h

@@ -113,6 +113,8 @@ extern "C" {
  *                       MODULE EXPORTED FUNCTIONS
  *
  *============================================================================*/
+bool isVendorEnhanced();
+void setVendorEnhanced(bool vendorEnhanced);
 void loc_read_conf(const char* conf_file_name,
                    const loc_param_s_type* config_table,
                    uint32_t table_length);