commit 4b35907fa3bf0724e290f5fd9872058782c03044
author Dan Willemsen <dwillemsen@google.com> Fri Feb 26 22:03:54 2016 -0800
committer Dan Willemsen <dwillemsen@google.com> Fri Feb 26 22:09:18 2016 -0800
tree ea5285ce1e8430793ee084d23fec425c7de54b3b
parent a3d4e93d67143d7f8740ec5241c2ec6aabdbae68

Fix duplicate gps.conf for Flo/Deb

flo and deb include gps.conf in the vendor blobs, don't attempt to
install it here as well.

Bug: 26294231
Change-Id: I837337170e8ee61876de01683a2f05b1f4350793

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