zenfone6: Add some product blobs

Change-Id: I6e0d674193edee3c943c2d2bb695678bb7989842
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index e62d730..aea3363 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -47,35 +47,9 @@
 # The standard blobs
 write_makefiles "$MY_DIR"/proprietary-files.txt
 
-# Qualcomm BSP blobs - we put a conditional around here
-# in case the BSP is actually being built
-printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$PRODUCTMK"
-printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$ANDROIDMK"
-
-write_makefiles "$MY_DIR"/proprietary-files-qc.txt
-
-# Qualcomm performance blobs - conditional as well
-# in order to support Cyanogen OS builds
-cat << EOF >> "$PRODUCTMK"
-endif
-
--include vendor/extra/devices.mk
-ifneq (\$(call is-qc-perf-target),true)
-EOF
+write_makefiles "$MY_DIR"/proprietary-files-product.txt
 
 cat << EOF >> "$ANDROIDMK"
-endif
-
-ifneq (\$(TARGET_HAVE_QC_PERF),true)
-EOF
-
-write_makefiles "$MY_DIR"/proprietary-files-qc-perf.txt
-
-echo "endif" >> "$PRODUCTMK"
-
-cat << EOF >> "$ANDROIDMK"
-
-endif
 
 EOF