seed: Cleanup blob list and extract scripts

* Don't split proprietary files list
* Pin more graphics blobs from crackling
* Fix source and destination paths

Change-Id: Ib6d25bcd1bb943b2e30ee06ef1ee60471da6dbb7

3 files changed, 493 insertions, 12 deletions

diff --git a/extract-files.sh b/extract-files.sh
index 570898c..a941432 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -52,7 +52,6 @@ fi
 # Initialize the helper
 setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
 
-extract "$MY_DIR"/proprietary-files-qc.txt "$SRC"
 extract "$MY_DIR"/proprietary-files.txt "$SRC"
 
 "$MY_DIR"/setup-makefiles.sh
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f49f4cd..ec6ae77 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,3 +1,482 @@
+# ADSP (jalebi)
+bin/adsprpcd|2128affb2fe10d4c6475002d0b04ebb1f9e321f7
+vendor/lib/libadsprpc.so|ae59d4ccc89ee80fa995f054d9cb366211e1be97
+vendor/lib/libfastcvopt.so|8137f5d8bbc963ca4ab0159919a52d0d6f6fc2c5
+
+# Audio
+vendor/lib/libacdb-fts.so
+vendor/lib/libacdbloader.so
+vendor/lib/libacdbrtac.so
+vendor/lib/libadiertac.so
+vendor/lib/libaudcal.so
+
+# Audio (crackling)
+vendor/lib/libFlacSwDec.so|e9fa8c6d5d8bb6d64d23c41028151c04e107da53
+vendor/lib/soundfx/libqcbassboost.so|0a4bca9cb849e7485ea150d97970f52142e9bb2c
+vendor/lib/soundfx/libqcreverb.so|d1655a55785b08956808f90f5e91a1d3660e80aa
+vendor/lib/soundfx/libqcvirt.so|6efbb9a93ac3f54640377e54fa00e21d2770638b
+
+# Bluetooth
+bin/btnvtool
+bin/hci_qcomm_init
+vendor/lib/libbtnv.so
+
+# Camera
+bin/mm-qcamera-daemon
+lib/hw/camera.msm8916.so
+lib/libmmcamera_interface.so
+lib/libmmjpeg_interface.so
+lib/libmm-qcamera.so
+lib/libqomx_core.so
+vendor/lib/libjpegdhw.so
+vendor/lib/libjpegehw.so
+vendor/lib/libmmcamera2_c2d_module.so
+vendor/lib/libmmcamera2_cpp_module.so
+vendor/lib/libmmcamera2_frame_algorithm.so
+vendor/lib/libmmcamera2_iface_modules.so
+vendor/lib/libmmcamera2_imglib_modules.so
+vendor/lib/libmmcamera2_isp_modules.so
+vendor/lib/libmmcamera2_is.so
+vendor/lib/libmmcamera2_pproc_modules.so
+vendor/lib/libmmcamera2_sensor_modules.so
+vendor/lib/libmmcamera2_stats_algorithm.so
+vendor/lib/libmmcamera2_stats_modules.so
+vendor/lib/libmmcamera2_vpe_module.so
+vendor/lib/libmmcamera2_wnr_module.so
+vendor/lib/libmmcamera_faceproc.so
+vendor/lib/libmmcamera_hdr_gb_lib.so
+vendor/lib/libmmcamera_hdr_lib.so
+vendor/lib/libmmcamera_imglib.so
+vendor/lib/libmmcamera_tintless_algo.so
+vendor/lib/libmmcamera_tintless_bg_pca_algo.so
+vendor/lib/libmmcamera_wavelet_lib.so
+vendor/lib/libmmipl.so
+vendor/lib/libmmjpeg.so
+vendor/lib/libmmqjpeg_codec.so
+vendor/lib/liboemcamera.so
+vendor/lib/libqomx_jpegenc.so
+
+# Camera actuator
+vendor/lib/libactuator_a3907_camcorder.so
+vendor/lib/libactuator_a3907_camera.so
+vendor/lib/libactuator_a3907.so
+vendor/lib/libactuator_dw9714_13p1ba_camcorder.so
+vendor/lib/libactuator_dw9714_13p1ba_camera.so
+vendor/lib/libactuator_dw9714_13p1ba.so
+vendor/lib/libactuator_dw9714a_cma334_camcorder.so
+vendor/lib/libactuator_dw9714a_cma334_camera.so
+vendor/lib/libactuator_dw9714a_cma334.so
+vendor/lib/libactuator_dw9714_camcorder.so
+vendor/lib/libactuator_dw9714_camera.so
+vendor/lib/libactuator_dw9714_q13n04a_camcorder.so
+vendor/lib/libactuator_dw9714_q13n04a_camera.so
+vendor/lib/libactuator_dw9714_q13n04a.so
+vendor/lib/libactuator_dw9714_q13v04b_camcorder.so
+vendor/lib/libactuator_dw9714_q13v04b_camera.so
+vendor/lib/libactuator_dw9714_q13v04b.so
+vendor/lib/libactuator_dw9714.so
+vendor/lib/libactuator_dw9716_camcorder.so
+vendor/lib/libactuator_dw9716_camera.so
+vendor/lib/libactuator_dw9716.so
+vendor/lib/libactuator_dw9718s_olq8a23_camcorder.so
+vendor/lib/libactuator_dw9718s_olq8a23_camera.so
+vendor/lib/libactuator_dw9718s_olq8a23.so
+vendor/lib/libactuator_dw9718s_olqba20_camcorder.so
+vendor/lib/libactuator_dw9718s_olqba20_camera.so
+vendor/lib/libactuator_dw9718s_olqba20.so
+vendor/lib/libactuator_iu074_camcorder.so
+vendor/lib/libactuator_iu074_camera.so
+vendor/lib/libactuator_iu074.so
+vendor/lib/libactuator_ov12830_camcorder.so
+vendor/lib/libactuator_ov12830_camera.so
+vendor/lib/libactuator_ov12830.so
+vendor/lib/libactuator_ov8825_camcorder.so
+vendor/lib/libactuator_ov8825_camera.so
+vendor/lib/libactuator_ov8825.so
+vendor/lib/libactuator_rohm_bu64243gwz_camcorder.so
+vendor/lib/libactuator_rohm_bu64243gwz_camera.so
+vendor/lib/libactuator_rohm_bu64243gwz.so
+
+# Camera chromatix
+vendor/lib/libchromatix_imx132_common.so
+vendor/lib/libchromatix_imx132_default_video.so
+vendor/lib/libchromatix_imx132_liveshot.so
+vendor/lib/libchromatix_imx132_preview.so
+vendor/lib/libchromatix_imx132_snapshot.so
+vendor/lib/libchromatix_imx134_common.so
+vendor/lib/libchromatix_imx134_default_video.so
+vendor/lib/libchromatix_imx134_hfr_120.so
+vendor/lib/libchromatix_imx134_hfr_60.so
+vendor/lib/libchromatix_imx134_preview.so
+vendor/lib/libchromatix_imx134_snapshot.so
+vendor/lib/libchromatix_imx135_common.so
+vendor/lib/libchromatix_imx135_default_video.so
+vendor/lib/libchromatix_imx135_hfr_120.so
+vendor/lib/libchromatix_imx135_hfr_60.so
+vendor/lib/libchromatix_imx135_hfr_90.so
+vendor/lib/libchromatix_imx135_liveshot.so
+vendor/lib/libchromatix_imx135_preview.so
+vendor/lib/libchromatix_imx135_snapshot.so
+vendor/lib/libchromatix_imx135_video_hd.so
+vendor/lib/libchromatix_imx179_olq8a23_common.so
+vendor/lib/libchromatix_imx179_olq8a23_default_video.so
+vendor/lib/libchromatix_imx179_olq8a23_hfr_120.so
+vendor/lib/libchromatix_imx179_olq8a23_preview.so
+vendor/lib/libchromatix_imx179_olq8a23_snapshot.so
+vendor/lib/libchromatix_imx179_olq8a23_zsl.so
+vendor/lib/libchromatix_imx214_common.so
+vendor/lib/libchromatix_imx214_default_video.so
+vendor/lib/libchromatix_imx214_hfr_120fps.so
+vendor/lib/libchromatix_imx214_hfr_60fps.so
+vendor/lib/libchromatix_imx214_hfr_90fps.so
+vendor/lib/libchromatix_imx214_liveshot.so
+vendor/lib/libchromatix_imx214_preview.so
+vendor/lib/libchromatix_imx214_snapshot_hdr.so
+vendor/lib/libchromatix_imx214_snapshot.so
+vendor/lib/libchromatix_imx214_video_hdr.so
+vendor/lib/libchromatix_ov13850_common.so
+vendor/lib/libchromatix_ov13850_default_video.so
+vendor/lib/libchromatix_ov13850_hfr_120fps.so
+vendor/lib/libchromatix_ov13850_hfr_60fps.so
+vendor/lib/libchromatix_ov13850_hfr_90fps.so
+vendor/lib/libchromatix_ov13850_preview.so
+vendor/lib/libchromatix_ov13850_snapshot.so
+vendor/lib/libchromatix_ov16825_common.so
+vendor/lib/libchromatix_ov16825_default_video.so
+vendor/lib/libchromatix_ov16825_preview.so
+vendor/lib/libchromatix_ov16825_snapshot.so
+vendor/lib/libchromatix_ov2680_5987fhq_common.so
+vendor/lib/libchromatix_ov2680_5987fhq_default_video.so
+vendor/lib/libchromatix_ov2680_5987fhq_preview.so
+vendor/lib/libchromatix_ov2680_5987fhq_snapshot.so
+vendor/lib/libchromatix_ov2680_common.so
+vendor/lib/libchromatix_ov2680_default_video.so
+vendor/lib/libchromatix_ov2680_pc0fb0003b_common.so
+vendor/lib/libchromatix_ov2680_pc0fb0003b_default_video.so
+vendor/lib/libchromatix_ov2680_pc0fb0003b_preview.so
+vendor/lib/libchromatix_ov2680_pc0fb0003b_snapshot.so
+vendor/lib/libchromatix_ov2680_preview.so
+vendor/lib/libchromatix_ov2680_snapshot.so
+vendor/lib/libchromatix_ov2720_common.so
+vendor/lib/libchromatix_ov2720_default_video.so
+vendor/lib/libchromatix_ov2720_hfr.so
+vendor/lib/libchromatix_ov2720_liveshot.so
+vendor/lib/libchromatix_ov2720_preview.so
+vendor/lib/libchromatix_ov2720_zsl.so
+vendor/lib/libchromatix_ov5648_oty5f03_common.so
+vendor/lib/libchromatix_ov5648_oty5f03_default_video.so
+vendor/lib/libchromatix_ov5648_oty5f03_preview.so
+vendor/lib/libchromatix_ov5648_oty5f03_snapshot.so
+vendor/lib/libchromatix_ov5648_oty5f03_zsl.so
+vendor/lib/libchromatix_ov5648_p5v18g_common.so
+vendor/lib/libchromatix_ov5648_p5v18g_default_video_hd.so
+vendor/lib/libchromatix_ov5648_p5v18g_default_video.so
+vendor/lib/libchromatix_ov5648_p5v18g_preview.so
+vendor/lib/libchromatix_ov5648_p5v18g_snapshot.so
+vendor/lib/libchromatix_ov5648_p5v18g_zsl.so
+vendor/lib/libchromatix_ov5648_q5v22e_common.so
+vendor/lib/libchromatix_ov5648_q5v22e_default_video_hd.so
+vendor/lib/libchromatix_ov5648_q5v22e_default_video.so
+vendor/lib/libchromatix_ov5648_q5v22e_preview.so
+vendor/lib/libchromatix_ov5648_q5v22e_snapshot.so
+vendor/lib/libchromatix_ov5648_q5v22e_zsl.so
+vendor/lib/libchromatix_ov5670_q5v41b_common.so
+vendor/lib/libchromatix_ov5670_q5v41b_default_video.so
+vendor/lib/libchromatix_ov5670_q5v41b_hfr_120fps.so
+vendor/lib/libchromatix_ov5670_q5v41b_hfr_60fps.so
+vendor/lib/libchromatix_ov5670_q5v41b_hfr_90fps.so
+vendor/lib/libchromatix_ov5670_q5v41b_liveshot.so
+vendor/lib/libchromatix_ov5670_q5v41b_preview.so
+vendor/lib/libchromatix_ov5670_q5v41b_snapshot.so
+vendor/lib/libchromatix_ov5670_q5v41b_video_hd.so
+vendor/lib/libchromatix_ov5670_q5v41b_zsl.so
+vendor/lib/libchromatix_ov8825_common.so
+vendor/lib/libchromatix_ov8825_default_video.so
+vendor/lib/libchromatix_ov8825_hfr_120fps.so
+vendor/lib/libchromatix_ov8825_hfr_60fps.so
+vendor/lib/libchromatix_ov8825_hfr_90fps.so
+vendor/lib/libchromatix_ov8825_liveshot_hd.so
+vendor/lib/libchromatix_ov8825_liveshot.so
+vendor/lib/libchromatix_ov8825_preview_hd.so
+vendor/lib/libchromatix_ov8825_preview.so
+vendor/lib/libchromatix_ov8825_snapshot_hd.so
+vendor/lib/libchromatix_ov8825_snapshot.so
+vendor/lib/libchromatix_ov8825_video_hd.so
+vendor/lib/libchromatix_ov8825_zsl.so
+vendor/lib/libchromatix_ov8858_common.so
+vendor/lib/libchromatix_ov8858_default_video.so
+vendor/lib/libchromatix_ov8858_hfr_120fps.so
+vendor/lib/libchromatix_ov8858_hfr_60fps.so
+vendor/lib/libchromatix_ov8858_hfr_90fps.so
+vendor/lib/libchromatix_ov8858_liveshot.so
+vendor/lib/libchromatix_ov8858_preview.so
+vendor/lib/libchromatix_ov8858_snapshot.so
+vendor/lib/libchromatix_ov8865_q8v18a_common.so
+vendor/lib/libchromatix_ov8865_q8v18a_default_video.so
+vendor/lib/libchromatix_ov8865_q8v18a_hfr_120fps.so
+vendor/lib/libchromatix_ov8865_q8v18a_hfr_60fps.so
+vendor/lib/libchromatix_ov8865_q8v18a_hfr_90fps.so
+vendor/lib/libchromatix_ov8865_q8v18a_liveshot.so
+vendor/lib/libchromatix_ov8865_q8v18a_preview.so
+vendor/lib/libchromatix_ov8865_q8v18a_snapshot.so
+vendor/lib/libchromatix_ov8865_q8v18a_video_hd.so
+vendor/lib/libchromatix_ov8865_q8v18a_zsl.so
+vendor/lib/libchromatix_ov9724_common.so
+vendor/lib/libchromatix_ov9724_default_video.so
+vendor/lib/libchromatix_ov9724_liveshot.so
+vendor/lib/libchromatix_ov9724_preview.so
+vendor/lib/libchromatix_s5k3l1yx_common.so
+vendor/lib/libchromatix_s5k3l1yx_default_video.so
+vendor/lib/libchromatix_s5k3l1yx_hfr_120fps.so
+vendor/lib/libchromatix_s5k3l1yx_hfr_60fps.so
+vendor/lib/libchromatix_s5k3l1yx_hfr_90fps.so
+vendor/lib/libchromatix_s5k3l1yx_liveshot.so
+vendor/lib/libchromatix_s5k3l1yx_preview.so
+vendor/lib/libchromatix_s5k3l1yx_snapshot.so
+vendor/lib/libchromatix_s5k3l1yx_video_hd.so
+vendor/lib/libchromatix_s5k3l1yx_zsl.so
+vendor/lib/libchromatix_s5k3m2_olqba20_common.so
+vendor/lib/libchromatix_s5k3m2_olqba20_default_video.so
+vendor/lib/libchromatix_s5k3m2_olqba20_hfr_120fps.so
+vendor/lib/libchromatix_s5k3m2_olqba20_hfr_60fps.so
+vendor/lib/libchromatix_s5k3m2_olqba20_hfr_90fps.so
+vendor/lib/libchromatix_s5k3m2_olqba20_preview.so
+vendor/lib/libchromatix_s5k3m2_olqba20_snapshot.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_common.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_default_video.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_hfr_120fps.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_hfr_60fps.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_hfr_90fps.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_liveshot.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_preview.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_snapshot.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_video_hd.so
+vendor/lib/libchromatix_S5K4E1_13P1BA_zsl.so
+vendor/lib/libchromatix_s5k4h5_cma334_common.so
+vendor/lib/libchromatix_s5k4h5_cma334_default_video.so
+vendor/lib/libchromatix_s5k4h5_cma334_hfr_120fps.so
+vendor/lib/libchromatix_s5k4h5_cma334_hfr_60fps.so
+vendor/lib/libchromatix_s5k4h5_cma334_hfr_90fps.so
+vendor/lib/libchromatix_s5k4h5_cma334_liveshot.so
+vendor/lib/libchromatix_s5k4h5_cma334_preview.so
+vendor/lib/libchromatix_s5k4h5_cma334_snapshot.so
+vendor/lib/libchromatix_s5k4h5_cma334_video_hd.so
+vendor/lib/libchromatix_s5k5e2_olq5f19_common.so
+vendor/lib/libchromatix_s5k5e2_olq5f19_liveshot.so
+vendor/lib/libchromatix_s5k5e2_olq5f19_preview.so
+vendor/lib/libchromatix_s5k5e2_olq5f19_snapshot.so
+vendor/lib/libchromatix_s5k5e2_olq5f19_video_hd.so
+vendor/lib/libchromatix_s5k5e2_olq5f19_video.so
+vendor/lib/libchromatix_SKUAA_ST_gc0339_common.so
+vendor/lib/libchromatix_SKUAA_ST_gc0339_default_video.so
+vendor/lib/libchromatix_SKUAA_ST_gc0339_preview.so
+vendor/lib/libchromatix_skuab_shinetech_gc0339_common.so
+vendor/lib/libchromatix_skuab_shinetech_gc0339_default_video.so
+vendor/lib/libchromatix_skuab_shinetech_gc0339_liveshot.so
+vendor/lib/libchromatix_skuab_shinetech_gc0339_preview.so
+vendor/lib/libchromatix_skuab_shinetech_gc0339_snapshot.so
+vendor/lib/libchromatix_skuab_shinetech_gc0339_zsl.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_common.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_default_video.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_hfr_120fps.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_hfr_60fps.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_hfr_90fps.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_liveshot.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_preview.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_snapshot.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_video_hd.so
+vendor/lib/libchromatix_SKUAB_ST_s5k4e1_zsl.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_common.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_default_video.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_hfr_120fps.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_hfr_60fps.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_hfr_90fps.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_preview.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_snapshot.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_video_hd.so
+vendor/lib/libchromatix_skuf_ov12830_p12v01c_zsl.so
+vendor/lib/libchromatix_skuf_ov5648_p5v23c_common.so
+vendor/lib/libchromatix_skuf_ov5648_p5v23c_default_video.so
+vendor/lib/libchromatix_skuf_ov5648_p5v23c_preview.so
+vendor/lib/libchromatix_skuf_ov5648_p5v23c_snapshot.so
+
+# Camera eeprom
+vendor/lib/libmmcamera_s5k3m2_olqba20_eeprom.so
+vendor/lib/libmmcamera_s5k5e2_olq5f19_eeprom.so
+vendor/lib/libmmcamera_s5k4h5_cma334_eeprom.so
+vendor/lib/libmmcamera_sonyimx135_eeprom.so
+vendor/lib/libmmcamera_sunny_p12v01m_eeprom.so
+vendor/lib/libmmcamera_sunny_p5v23c_eeprom.so
+vendor/lib/libmmcamera_sunny_q13v04b_eeprom.so
+vendor/lib/libmmcamera_sunny_q5v22e_eeprom.so
+vendor/lib/libmmcamera_sunny_q5v41b_eeprom.so
+vendor/lib/libmmcamera_sunny_q8v18a_eeprom.so
+vendor/lib/libmmcamera_truly_cm7700_eeprom.so
+
+# Camera firmware
+etc/firmware/cpp_firmware_v1_1_1.fw
+etc/firmware/cpp_firmware_v1_1_6.fw
+etc/firmware/cpp_firmware_v1_2_0.fw
+etc/firmware/cpp_firmware_v1_4_0.fw
+
+# Camera sensors
+vendor/lib/libmmcamera_imx132.so
+vendor/lib/libmmcamera_imx134.so
+vendor/lib/libmmcamera_imx135.so
+vendor/lib/libmmcamera_imx179_olq8a23.so
+vendor/lib/libmmcamera_imx214.so
+vendor/lib/libmmcamera_mt9m114.so
+vendor/lib/libmmcamera_ofilm_oty5f03_eeprom.so
+vendor/lib/libmmcamera_ov13850.so
+vendor/lib/libmmcamera_ov16825.so
+vendor/lib/libmmcamera_ov2680_5987fhq.so
+vendor/lib/libmmcamera_ov2680_pc0fb0003b.so
+vendor/lib/libmmcamera_ov2680.so
+vendor/lib/libmmcamera_ov2720.so
+vendor/lib/libmmcamera_ov5645.so
+vendor/lib/libmmcamera_ov5648_oty5f03.so
+vendor/lib/libmmcamera_ov5648_p5v18g.so
+vendor/lib/libmmcamera_ov5648_q5v22e.so
+vendor/lib/libmmcamera_ov5670_q5v41b.so
+vendor/lib/libmmcamera_ov8825.so
+vendor/lib/libmmcamera_ov8858_q8v19w.so
+vendor/lib/libmmcamera_ov8858.so
+vendor/lib/libmmcamera_ov8865_q8v18a.so
+vendor/lib/libmmcamera_ov9724.so
+vendor/lib/libmmcamera_s5k3l1yx.so
+vendor/lib/libmmcamera_s5k3m2_olqba20.so
+vendor/lib/libmmcamera_S5K4E1_13P1BA.so
+vendor/lib/libmmcamera_s5k4h5_cma334.so
+vendor/lib/libmmcamera_s5k5e2_olq5f19.so
+vendor/lib/libmmcamera_SKUAA_ST_gc0339.so
+vendor/lib/libmmcamera_skuab_shinetech_gc0339.so
+vendor/lib/libmmcamera_SKUAB_ST_s5k4e1.so
+vendor/lib/libmmcamera_skuf_ov12830_p12v01c.so
+vendor/lib/libmmcamera_skuf_ov5648_p5v23c.so
+vendor/lib/libmmcamera_sp1628.so
+
+# DRM
+bin/qseecomd
+vendor/lib/libdrmdecrypt.so
+vendor/lib/libdrmfs.so
+vendor/lib/libdrmtime.so
+vendor/lib/libQSEEComAPI.so
+vendor/lib/librpmb.so
+vendor/lib/libssd.so
+vendor/lib/libwvdrm_L3.so
+vendor/lib/libwvm.so
+vendor/lib/libWVStreamControlAPI_L3.so
+vendor/lib/drm/libdrmwvmplugin.so
+vendor/lib/mediadrm/libwvdrmengine.so
+
+# GPS (crackling)
+-lib/libloc_api_v02.so|9eeec554a3f0bef148d4696a02f3f9d4599b40b7
+-lib/libloc_ds_api.so|3beb68f664e95c161114cb882177b93ca45b2379
+vendor/lib/hw/flp.default.so|6d0fbc257f55373274a970f7081c3504a0a5178f
+vendor/lib/libgeofence.so|b91de149da071fddb42772bb10439077d7b0b39a
+vendor/lib/libizat_core.so|bf23714f97dbe611148c592c6677ee0171d36336
+vendor/lib/liblbs_core.so|3b7d32ca9ce3dec791d2dc7c25585bffb0b2d3a4
+
+# Graphics (pinned blobs from crackling)
+vendor/lib/egl/eglsubAndroid.so
+vendor/lib/egl/eglSubDriverAndroid.so|1fd1f3d52fd8dc088cf203089dd941153346ce62
+vendor/lib/egl/libEGL_adreno.so
+vendor/lib/egl/libESXEGL_adreno.so|d5074fd3ef035e5bcb5cd8473468eb5f83affbe5
+vendor/lib/egl/libESXGLESv1_CM_adreno.so|20475a289ad996ca31236bc8ddeac5433bdc269f
+vendor/lib/egl/libGLESv1_CM_adreno.so
+vendor/lib/egl/libESXGLESv2_adreno.so|36bb5cf5767b92bc813961e8f891b93d74c2421e
+vendor/lib/egl/libGLESv2_adreno.so
+vendor/lib/egl/libq3dtools_adreno.so
+vendor/lib/egl/libQTapGLES.so|641e9dcb76d8339a162f7be548cd199685815583
+vendor/lib/egl/libRBEGL_adreno.so
+vendor/lib/egl/libRBGLESv1_CM_adreno.so
+vendor/lib/egl/libRBGLESv2_adreno.so
+vendor/lib/libadreno_utils.so
+vendor/lib/libc2d30-a3xx.so
+vendor/lib/libC2D2.so
+vendor/lib/libCB.so
+vendor/lib/libgsl.so
+vendor/lib/libllvm-glnext.so|f89e2037b462c8af0f94cdbdeca075452bce0edd
+vendor/lib/libllvm-qcom.so
+vendor/lib/libOpenCL.so|571a73f8c888b1cb91706ca800a8fbd2ea3e44a7
+vendor/lib/libRSDriver_adreno.so
+vendor/lib/librs_adreno.so
+vendor/lib/librs_adreno_sha1.so
+vendor/lib/libsc-a3xx.so
+vendor/lib/libscale.so|277641b50da05c6e3a67bf5199c9873e2d5429e8
+
+# Graphics firmware
+vendor/firmware/a300_pfp.fw:etc/firmware/a300_pfp.fw
+vendor/firmware/a300_pm4.fw:etc/firmware/a300_pm4.fw
+
+# Media (crackling)
+lib/libOmxVdecHevc.so|560d662a6120cc23bc0db9af51230ce60d756eda
+vendor/lib/libHevcSwDecoder.so|70e9c70aeb4a245433f2501d47ee01eb9ba3e5e0
+vendor/lib/libI420colorconvert.so|4fba21c63702d4ce153c5f9425d0dd520472d038
+vendor/lib/libmmosal.so|89dfcf01a209a6b0ea586d292753c0502312e4bd
+vendor/lib/libmm-color-convertor.so|a6c53cd2fc0e8c84d8f49c712d923e0425257b17
+vendor/lib/libOmxAacDec.so|fd3b375d5f477474154de3ac4a7db9b91158f0f4
+vendor/lib/libOmxEvrcDec.so|f5f8b7702f0e6858ff473d740be0bcf886abaa9a
+vendor/lib/libOmxQcelp13Dec.so|2766d69b1797441ba2bdc9ab0928c22d1ecc99a9
+
+# Perf
+bin/perfd:vendor/bin/perfd
+vendor/lib/libqti-perfd-client.so
+
+# Postprocessing (jalebi)
+bin/mm-pp-daemon|b8c3cc40ae4cadec31cfa76c9b9a51df35b96801
+vendor/lib/libdisp-aba.so|1b9640a8a5ea769fc5f5599bb26f679b7b984736
+vendor/lib/libmm-abl.so|ed53223a798c1897fc4368a3ce2c46c34e44c2e0
+vendor/lib/libmm-abl-oem.so|5940ead47b7ef85315d0ca0ad7ba126d2ac10b06
+vendor/lib/libmm-als.so|0d3504a0536c0ceb9f4c20f13f7abd5558c068f2
+vendor/lib/libmm-disp-apis.so|9e93b3bbca952dd7e474ba643431ddcacd6e9792
+vendor/lib/libmm-qdcm.so|c04317a68c2b6581fc908edc9137c8fae8ef1575
+
+# Power
+bin/vm_bms
+
+# Qualcomm framework (jalebi)
+bin/irsc_util|787bd12a31ec581ee515ee32b610e56fc2833863
+vendor/lib/libdiag.so|5cae33cc79a68c8916a133de617f4cbecbef98ac
+vendor/lib/libdsi_netctrl.so|29654040a4842df38fad8a8dc896857460667819
+vendor/lib/libdsutils.so|d4bf9e98c65fe8adb36cad85ebf48526137b30be
+vendor/lib/libidl.so|ebbfe34beebb25e6178e3dc0d79152cdd81a93e1
+vendor/lib/libqcci_legacy.so|8e6bfb1b13f055a8fd6df3e313f2806981f8291d
+vendor/lib/libqdi.so|15646b0b33be05f216013a57ce659f12385316cb
+vendor/lib/libqdp.so|da49dfa248e3eccc9273d686caff8063428217e2
+vendor/lib/libqmi_cci.so|eef6bba94332795ac622b1e682122c3517d0a4e1
+vendor/lib/libqmi_client_helper.so|aea48215726c8df37e4ab27a747ef2178bbb5fe6
+vendor/lib/libqmi_client_qmux.so|9f296dd1b6a7f4ebd12773351f6fd37b7a42fb12
+vendor/lib/libqmi_common_so.so|e756f9640d0661446c8bf184d0e24b8c315f6c78
+vendor/lib/libqmi_csi.so|dffd42c56773fbc286945230184448bf24598890
+vendor/lib/libqmi_encdec.so|124cd8ab6ed24f2b315ece15e18a2345815d6901
+vendor/lib/libqmiservices.so|25e8803032ab9c191ffcf45507286abc72460c7d
+vendor/lib/libqmi.so|5251426638ec6ace5e399e9c541f3c846acb9f52
+vendor/lib/libsmemlog.so|b87c633d0faa143db4744bd17de5b03d600df15e
+
+# Radio (jalebi)
+-app/shutdownlistener/shutdownlistener.apk|bb1577ef19b491cbd343a15714d9dd7e5e761689
+bin/netmgrd|da382606d916b331a8bd5eae151dbd245ae26063
+bin/qmuxd|6ff5f50f05973c34cc4516e5b4f5ca9c400bf94d
+bin/radish|cd024f6b00374889b2d8c32e56aa615488dfa1e2
+bin/rmt_storage|079e247fbebeb215de4775a842d77b086304f322
+etc/permissions/qcnvitems.xml|dc0e70cace2317b5169a454cbc2bbf8887c18d55
+etc/permissions/qcrilhook.xml|9fc58a3d54d20ac1d53bab14608815121aefbce5
+-framework/qcnvitems.jar|c07b1cc603c84414ee1b33749ea492b9d7a9e181
+-framework/qcrilhook.jar|d8cd25a1ca0a49c1a69d856d8846a517725785ec
+-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|250eeb259f908070ac302ce66832d0c030473015
+vendor/lib/libcneapiclient.so|1cd1a5a4db60d1b2f99a124663eba3b10cbb5c89
+vendor/lib/libconfigdb.so|0baff7fcba0f1a22b8ec1b08f6068579ed527452
+vendor/lib/liblqe.so|e4a40f8675c5b52f1bb71aa2fea62d7ffcd9b003
+vendor/lib/libmdmdetect.so|00dcc86d87300acbc10e4916a543717ccfc776db
+vendor/lib/libnetmgr.so|9933916723c598d7c5b6ed3c12cab9ec852a20e8
+vendor/lib/libperipheral_client.so|d5c62a77a1fee7797f5e74cfbfa8854d5f0ea52b
+vendor/lib/libril-qc-qmi-1.so|50b415e0bee72604380115f4450d79a50ffae995
+vendor/lib/libril-qc-radioconfig.so|7fe31633a1a4f5ca291e56456017ff1717907fc2
+vendor/lib/libril-qcril-hook-oem.so|72d922cbe67c1387b501e32547630dbb19fc6e5b
+vendor/lib/libsystem_health_mon.so|808950a838e8f01f0c6efe1ef25acc4ca3376a45
+vendor/lib/libxml.so|8b9cae9b4d1525e7fea093d6a53f363c842f3076
+
 # Signed Venus (media) firmware
 etc/firmware/venus.b00
 etc/firmware/venus.b01
@@ -6,3 +485,17 @@ etc/firmware/venus.b03
 etc/firmware/venus.b04
 etc/firmware/venus.mbn
 etc/firmware/venus.mdt
+
+# Thermal
+bin/thermal-engine:vendor/bin/thermal-engine
+vendor/lib/libthermalclient.so
+vendor/lib/libthermalioctl.so
+
+# Time services
+-app/TimeService/TimeService.apk
+bin/time_daemon
+-vendor/lib/libtime_genoff.so
+vendor/lib/libTimeService.so
+
+# WLAN (crackling)
+lib/libwcnss_qmi.so|371a27ab7bcb8354433d6028a5ad422ebc1783f2
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 6935c07..0b1408c 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -45,19 +45,8 @@ write_headers
 # 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
-
-echo "endif" >> "$PRODUCTMK"
-
 cat << EOF >> "$ANDROIDMK"
-endif
 
-\$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null)
 EOF
 
 printf '\n%s\n' "\$(call inherit-product, vendor/qcom/binaries/msm8916/graphics/graphics-vendor.mk)" >> "$PRODUCTMK"