From 8126cb8c09f99ae625364c98b1301d0c5390e27d Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Mon, 13 Jun 2016 11:17:23 -0700
Subject: z2_plus: Disable the combo provider

 * With combo provider enabled we see the heading while navigating
   freeze and jump erratically. Let's just disable it. With this
   configuration, we still get hardware geofences and such.

Change-Id: Ic37d6b7064dce19fa2f4f75ab74bc036b6b33611
---
 setup-makefiles.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'setup-makefiles.sh')

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index a0e6e50..2304bf5 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -33,19 +33,11 @@ CM_ROOT="$MY_DIR"/../../..
 printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$PRODUCTMK"
 printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$ANDROIDMK"
 
-<<<<<<< HEAD
+
 # Qualcomm performance blobs - conditional as well
 # in order to support LineageOS builds
-cat << EOF >> "$PRODUCTMK"
+
 endif
-=======
-PRODUCT_PACKAGES += \\
-    CNEService \\
-    com.qualcomm.location \\
-    dpmserviceapp \\
-    qcrilmsgtunnel \\
-    QtiTetherService
->>>>>>> 05c9d04... gemini: Enable QC location services
 
 -include vendor/extra/devices.mk
 ifneq (\$(call is-qc-perf-target),true)
-- 
cgit v1.2.3