aboutsummaryrefslogtreecommitdiff
path: root/setup-makefiles.sh
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-06-13 11:17:23 -0700
committerdavidevinavil <davidevinavil@gmail.com>2017-01-21 18:26:07 +0100
commit8126cb8c09f99ae625364c98b1301d0c5390e27d (patch)
treee746055c69b6e98186d61b5495b91aecbfccf426 /setup-makefiles.sh
parentec9758c57d4a2b0f615a1729f29e4f952eaf5131 (diff)
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
Diffstat (limited to 'setup-makefiles.sh')
-rwxr-xr-xsetup-makefiles.sh12
1 files changed, 2 insertions, 10 deletions
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)