commit 558ea5a3457cf60287019a3d0d4035afd7c99846
author Ajit Kumar <kajit@qti.qualcomm.com> Tue Dec 13 23:41:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 13 23:41:08 2016 +0000
tree bba7bd2dec07c5b3ecb4a2c8d5e1d284d1144a7c
parent 2fc9d83718f99c0ef5a71edf62218aa5bd35e6fc
parent da0886d286be18db32883fea860764eee1f09a68

Added XTRA CA path to gps.conf am: 47b626358a
am: da0886d286

Change-Id: I1de19da4c57a409946332064c19bb8a8c7183986

msm8084/core/Android.mk

diff --git a/msm8084/core/Android.mk b/msm8084/core/Android.mk
index 8b5898c..c7ea75c 100644
--- a/msm8084/core/Android.mk
+++ b/msm8084/core/Android.mk
@@ -12,6 +12,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
+    liblog \
     libcutils \
     libgps.utils \
     libdl

msm8084/etc/Android.mk

diff --git a/msm8084/etc/Android.mk b/msm8084/etc/Android.mk
index a6914a2..80e1461 100644
--- a/msm8084/etc/Android.mk
+++ b/msm8084/etc/Android.mk
@@ -1,10 +1,10 @@
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := gps.conf
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/
-LOCAL_SRC_FILES := gps.conf
-
-include $(BUILD_PREBUILT)
+#include $(CLEAR_VARS)
+#
+#LOCAL_MODULE := gps.conf
+#LOCAL_MODULE_TAGS := optional
+#LOCAL_MODULE_CLASS := ETC
+#LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/
+#LOCAL_SRC_FILES := gps.conf
+#
+#include $(BUILD_PREBUILT)

msm8960/etc/Android.mk

diff --git a/msm8960/etc/Android.mk b/msm8960/etc/Android.mk
index 025d3f7..427b5c8 100644
--- a/msm8960/etc/Android.mk
+++ b/msm8960/etc/Android.mk
@@ -1,5 +1,7 @@
 
 LOCAL_PATH := $(call my-dir)
+
+ifeq ($(filter flo deb,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
@@ -9,4 +11,4 @@
 LOCAL_SRC_FILES := gps.conf
 
 include $(BUILD_PREBUILT)
-
+endif

msm8994/core/Android.mk

diff --git a/msm8994/core/Android.mk b/msm8994/core/Android.mk
index e1ac45a..46d5343 100644
--- a/msm8994/core/Android.mk
+++ b/msm8994/core/Android.mk
@@ -18,6 +18,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
+    liblog \
     libcutils \
     libgps.utils \
     libdl

msm8994/utils/loc_timer.c

diff --git a/msm8994/utils/loc_timer.c b/msm8994/utils/loc_timer.c
index 2beca5f..56db489 100644
--- a/msm8994/utils/loc_timer.c
+++ b/msm8994/utils/loc_timer.c
@@ -183,6 +183,7 @@
     pthread_cond_destroy(&t->timer_cond);
 t_err:
     free(t);
+    t = NULL;
 _err:
     LOC_LOGD("%s:%d]: Exit\n", __func__, __LINE__);
     return t;

msm8996/core/Android.mk

diff --git a/msm8996/core/Android.mk b/msm8996/core/Android.mk
index 4381555..74f3f73 100644
--- a/msm8996/core/Android.mk
+++ b/msm8996/core/Android.mk
@@ -17,6 +17,7 @@
 endif
 
 LOCAL_SHARED_LIBRARIES := \
+    liblog \
     libutils \
     libcutils \
     libgps.utils \