commit 0ebc797f0ba144f88ee4275e889bea9e29cc6e28
author Thierry Strudel <tstrudel@google.com> Thu Oct 13 21:36:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 21:36:22 2016 +0000
tree 22f53c67291004de6a439ec0a30dc9ddbaedbad1
parent 0061f41bb8f16da89964b83e7eccc0ebb9823d02
parent 2f928597e7bcb135cfc73e9ba04da45e66c1638b

msmcobalt: Update to 07.00.00.253.032 am: 5bea9589b6
am: 2f928597e7

Change-Id: I4d8899135d286688f68851793a50e7a7759be960

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

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 \