commit 0999be14eecf4209903da35a2304399cc1f3ea67
author Dan Willemsen <dwillemsen@google.com> Sat Feb 27 07:02:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 27 07:02:56 2016 +0000
tree d1ab59fe6d3e4dd4617fc6badd493e961d868e21
parent 6fccfd8f5fde5bca21d1cda972da96b28db49a3c
parent d5810f1a3a8df3b15b41dba50da63bbdfc9ff263

Merge "Fix duplicate gps.conf for Flo/Deb"
am: d5810f1a3a

* commit 'd5810f1a3a8df3b15b41dba50da63bbdfc9ff263':
  Fix duplicate gps.conf for Flo/Deb

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