aboutsummaryrefslogtreecommitdiff
path: root/setup-makefiles.sh
diff options
context:
space:
mode:
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)