Merge "Update propietary blobs for mako" into klp-dev
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 2331cd5..5bb7052 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -38,7 +38,6 @@
 /system/bin/usbhub
 /system/bin/usbhub_init
 /system/bin/v4l2-qcamera-app
-/system/etc/DxHDCP.cfg
 /system/etc/firmware/tzapps.b00
 /system/etc/firmware/tzapps.b01
 /system/etc/firmware/tzapps.b02
@@ -103,7 +102,6 @@
 /system/lib/libdss.so
 /system/lib/libdsucsd.so
 /system/lib/libdsutils.so
-/system/lib/libDxHdcp.so
 /system/lib/libgemini.so
 /system/lib/libgps.utils.so
 /system/lib/libgsl.so
@@ -160,16 +158,31 @@
 /system/vendor/firmware/a300_pm4.fw
 /system/vendor/firmware/bcm2079x_firmware.ncd
 /system/vendor/firmware/bcm2079x_pre_firmware.ncd
-/system/vendor/firmware/discretix/dxhdcp2.b00
-/system/vendor/firmware/discretix/dxhdcp2.b01
-/system/vendor/firmware/discretix/dxhdcp2.b02
-/system/vendor/firmware/discretix/dxhdcp2.b03
-/system/vendor/firmware/discretix/dxhdcp2.mdt
+/system/vendor/firmware/dsps.b00
+/system/vendor/firmware/dsps.b01
+/system/vendor/firmware/dsps.b02
+/system/vendor/firmware/dsps.b03
+/system/vendor/firmware/dsps.b04
+/system/vendor/firmware/dsps.b05
+/system/vendor/firmware/dsps.mdt
 /system/vendor/firmware/keymaster/keymaster.b00
 /system/vendor/firmware/keymaster/keymaster.b01
 /system/vendor/firmware/keymaster/keymaster.b02
 /system/vendor/firmware/keymaster/keymaster.b03
 /system/vendor/firmware/keymaster/keymaster.mdt
+/system/vendor/firmware/q6.b00
+/system/vendor/firmware/q6.b01
+/system/vendor/firmware/q6.b03
+/system/vendor/firmware/q6.b04
+/system/vendor/firmware/q6.b05
+/system/vendor/firmware/q6.b06
+/system/vendor/firmware/q6.mdt
+/system/vendor/firmware/wcnss.b00
+/system/vendor/firmware/wcnss.b01
+/system/vendor/firmware/wcnss.b02
+/system/vendor/firmware/wcnss.b04
+/system/vendor/firmware/wcnss.b05
+/system/vendor/firmware/wcnss.mdt
 /system/vendor/lib/libdrmdecrypt.so
 /system/vendor/lib/libgeofence.so
 /system/vendor/lib/libizat_core.so
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index fe2b105..be728df 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -6,17 +6,10 @@
     ;;
   lge)
     TO_EXTRACT="\
-            system/etc/DxHDCP.cfg \
-            system/lib/libAKM.so \
-            system/lib/libDxHdcp.so \
             system/lib/libacdbdata.so \
+            system/lib/libAKM.so \
             system/lib/libcamera_fast_af.so \
             system/lib/libmorpho_noise_reduction.so \
-            system/vendor/firmware/discretix/dxhdcp2.b00 \
-            system/vendor/firmware/discretix/dxhdcp2.b01 \
-            system/vendor/firmware/discretix/dxhdcp2.b02 \
-            system/vendor/firmware/discretix/dxhdcp2.b03 \
-            system/vendor/firmware/discretix/dxhdcp2.mdt \
             system/vendor/firmware/keymaster/keymaster.b00 \
             system/vendor/firmware/keymaster/keymaster.b01 \
             system/vendor/firmware/keymaster/keymaster.b02 \
@@ -55,27 +48,29 @@
             system/etc/firmware/tzapps.b02 \
             system/etc/firmware/tzapps.b03 \
             system/etc/firmware/tzapps.mdt \
+            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidc.b00 \
             system/etc/firmware/vidc.b01 \
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
             system/etc/firmware/vidc.mdt \
-            system/etc/firmware/vidc_1080p.fw \
             system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno200.so \
-            system/lib/egl/libGLESv1_CM_adreno200.so \
-            system/lib/egl/libGLESv2_adreno200.so \
-            system/lib/egl/libq3dtools_adreno200.so \
+            system/lib/egl/libEGL_adreno.so \
+            system/lib/egl/libGLESv1_CM_adreno.so \
+            system/lib/egl/libGLESv2_adreno.so \
+            system/lib/egl/libplayback_adreno.so \
+            system/lib/egl/libq3dtools_adreno.so \
+            system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
-            system/lib/libC2D2.so \
-            system/lib/libCommandSvc.so \
-            system/lib/libI420colorconvert.so \
-            system/lib/libQSEEComAPI.so \
             system/lib/libacdbloader.so \
+            system/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libc2d2_a3xx.so \
+            system/lib/libC2D2.so \
+            system/lib/libc2d30-a3xx.so \
+            system/lib/libc2d30.so \
+            system/lib/libCB.so \
             system/lib/libchromatix_imx111_default_video.so \
             system/lib/libchromatix_imx111_preview.so \
             system/lib/libchromatix_imx111_zsl.so \
@@ -95,6 +90,7 @@
             system/lib/libchromatix_s5k4e1_preview.so \
             system/lib/libchromatix_vx6953_default_video.so \
             system/lib/libchromatix_vx6953_preview.so \
+            system/lib/libCommandSvc.so \
             system/lib/libconfigdb.so \
             system/lib/libcsd-client.so \
             system/lib/libdiag.so \
@@ -107,30 +103,29 @@
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
             system/lib/libgemini.so \
-            system/lib/libgeofence.so \
             system/lib/libgps.utils.so \
             system/lib/libgsl.so \
+            system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
             system/lib/libimage-jpeg-dec-omx-comp.so \
             system/lib/libimage-jpeg-enc-omx-comp.so \
             system/lib/libimage-omx-common.so \
             system/lib/libllvm-a3xx.so \
-            system/lib/libloc_adapter.so \
-            system/lib/libloc_api_v02.so \
+            system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
             system/lib/libmercury.so \
-            system/lib/libmm-color-convertor.so \
             system/lib/libmmcamera_faceproc.so \
             system/lib/libmmcamera_frameproc.so \
             system/lib/libmmcamera_hdr_lib.so \
             system/lib/libmmcamera_image_stab.so \
             system/lib/libmmcamera_statsproc31.so \
             system/lib/libmmcamera_wavelet_lib.so \
+            system/lib/libmm-color-convertor.so \
             system/lib/libmmipl.so \
             system/lib/libmmjpeg.so \
             system/lib/libmmjps.so \
-            system/lib/libmmmpo.so \
             system/lib/libmmmpod.so \
+            system/lib/libmmmpo.so \
             system/lib/libmmstillomx.so \
             system/lib/libnetmgr.so \
             system/lib/liboemcamera.so \
@@ -138,7 +133,6 @@
             system/lib/libqcci_legacy.so \
             system/lib/libqdi.so \
             system/lib/libqdp.so \
-            system/lib/libqmi.so \
             system/lib/libqmi_cci.so \
             system/lib/libqmi_client_qmux.so \
             system/lib/libqmi_common_so.so \
@@ -146,8 +140,13 @@
             system/lib/libqmi_csvt_srvc.so \
             system/lib/libqmi_encdec.so \
             system/lib/libqmiservices.so \
+            system/lib/libqmi.so \
+            system/lib/libQSEEComAPI.so \
             system/lib/libril-qc-qmi-1.so \
             system/lib/libril-qcril-hook-oem.so \
+            system/lib/librs_adreno_sha1.so \
+            system/lib/librs_adreno.so \
+            system/lib/libRSDriver_adreno.so \
             system/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
@@ -156,6 +155,30 @@
             system/lib/libxml.so \
             system/vendor/firmware/a300_pfp.fw \
             system/vendor/firmware/a300_pm4.fw \
+            system/vendor/firmware/dsps.b00 \
+            system/vendor/firmware/dsps.b01 \
+            system/vendor/firmware/dsps.b02 \
+            system/vendor/firmware/dsps.b03 \
+            system/vendor/firmware/dsps.b04 \
+            system/vendor/firmware/dsps.b05 \
+            system/vendor/firmware/dsps.mdt \
+            system/vendor/firmware/q6.b00 \
+            system/vendor/firmware/q6.b01 \
+            system/vendor/firmware/q6.b03 \
+            system/vendor/firmware/q6.b04 \
+            system/vendor/firmware/q6.b05 \
+            system/vendor/firmware/q6.b06 \
+            system/vendor/firmware/q6.mdt \
+            system/vendor/firmware/wcnss.b00 \
+            system/vendor/firmware/wcnss.b01 \
+            system/vendor/firmware/wcnss.b02 \
+            system/vendor/firmware/wcnss.b04 \
+            system/vendor/firmware/wcnss.b05 \
+            system/vendor/firmware/wcnss.mdt \
             system/vendor/lib/libdrmdecrypt.so \
+            system/vendor/lib/libgeofence.so \
+            system/vendor/lib/libizat_core.so \
+            system/vendor/lib/libloc_api_v02.so \
+            system/vendor/lib/libloc_ds_api.so \
             "
     ;;
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index e62f32b..f480636 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -32,7 +32,7 @@
 # 736095 = JWR66U
 # 737497 = JWR66V
 # end jb-mr2-dev
-BRANCH=jb-mr2-dev
+BRANCH=klp-dev
 if test $BRANCH = jb-mr1.1-dev
 then
   ZIP=occam-ota-573038
@@ -43,6 +43,11 @@
   ZIP=occam-ota-737497
   BUILD=jwr66v
 fi # jb-mr2-dev
+if test $BRANCH = klp-dev
+then
+  ZIP=occam-ota-882570
+  BUILD=882570
+fi # klp-dev
 ROOTDEVICE=mako
 DEVICE=mako
 MANUFACTURER=lge
@@ -63,17 +68,10 @@
     ;;
   lge)
     TO_EXTRACT="\
-            system/etc/DxHDCP.cfg \
-            system/lib/libAKM.so \
-            system/lib/libDxHdcp.so \
             system/lib/libacdbdata.so \
+            system/lib/libAKM.so \
             system/lib/libcamera_fast_af.so \
             system/lib/libmorpho_noise_reduction.so \
-            system/vendor/firmware/discretix/dxhdcp2.b00 \
-            system/vendor/firmware/discretix/dxhdcp2.b01 \
-            system/vendor/firmware/discretix/dxhdcp2.b02 \
-            system/vendor/firmware/discretix/dxhdcp2.b03 \
-            system/vendor/firmware/discretix/dxhdcp2.mdt \
             system/vendor/firmware/keymaster/keymaster.b00 \
             system/vendor/firmware/keymaster/keymaster.b01 \
             system/vendor/firmware/keymaster/keymaster.b02 \
@@ -112,27 +110,29 @@
             system/etc/firmware/tzapps.b02 \
             system/etc/firmware/tzapps.b03 \
             system/etc/firmware/tzapps.mdt \
+            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidc.b00 \
             system/etc/firmware/vidc.b01 \
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
             system/etc/firmware/vidc.mdt \
-            system/etc/firmware/vidc_1080p.fw \
             system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno200.so \
-            system/lib/egl/libGLESv1_CM_adreno200.so \
-            system/lib/egl/libGLESv2_adreno200.so \
-            system/lib/egl/libq3dtools_adreno200.so \
+            system/lib/egl/libEGL_adreno.so \
+            system/lib/egl/libGLESv1_CM_adreno.so \
+            system/lib/egl/libGLESv2_adreno.so \
+            system/lib/egl/libplayback_adreno.so \
+            system/lib/egl/libq3dtools_adreno.so \
+            system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
-            system/lib/libC2D2.so \
-            system/lib/libCommandSvc.so \
-            system/lib/libI420colorconvert.so \
-            system/lib/libQSEEComAPI.so \
             system/lib/libacdbloader.so \
+            system/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libc2d2_a3xx.so \
+            system/lib/libC2D2.so \
+            system/lib/libc2d30-a3xx.so \
+            system/lib/libc2d30.so \
+            system/lib/libCB.so \
             system/lib/libchromatix_imx111_default_video.so \
             system/lib/libchromatix_imx111_preview.so \
             system/lib/libchromatix_imx111_zsl.so \
@@ -152,6 +152,7 @@
             system/lib/libchromatix_s5k4e1_preview.so \
             system/lib/libchromatix_vx6953_default_video.so \
             system/lib/libchromatix_vx6953_preview.so \
+            system/lib/libCommandSvc.so \
             system/lib/libconfigdb.so \
             system/lib/libcsd-client.so \
             system/lib/libdiag.so \
@@ -164,30 +165,29 @@
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
             system/lib/libgemini.so \
-            system/lib/libgeofence.so \
             system/lib/libgps.utils.so \
             system/lib/libgsl.so \
+            system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
             system/lib/libimage-jpeg-dec-omx-comp.so \
             system/lib/libimage-jpeg-enc-omx-comp.so \
             system/lib/libimage-omx-common.so \
             system/lib/libllvm-a3xx.so \
-            system/lib/libloc_adapter.so \
-            system/lib/libloc_api_v02.so \
+            system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
             system/lib/libmercury.so \
-            system/lib/libmm-color-convertor.so \
             system/lib/libmmcamera_faceproc.so \
             system/lib/libmmcamera_frameproc.so \
             system/lib/libmmcamera_hdr_lib.so \
             system/lib/libmmcamera_image_stab.so \
             system/lib/libmmcamera_statsproc31.so \
             system/lib/libmmcamera_wavelet_lib.so \
+            system/lib/libmm-color-convertor.so \
             system/lib/libmmipl.so \
             system/lib/libmmjpeg.so \
             system/lib/libmmjps.so \
-            system/lib/libmmmpo.so \
             system/lib/libmmmpod.so \
+            system/lib/libmmmpo.so \
             system/lib/libmmstillomx.so \
             system/lib/libnetmgr.so \
             system/lib/liboemcamera.so \
@@ -195,7 +195,6 @@
             system/lib/libqcci_legacy.so \
             system/lib/libqdi.so \
             system/lib/libqdp.so \
-            system/lib/libqmi.so \
             system/lib/libqmi_cci.so \
             system/lib/libqmi_client_qmux.so \
             system/lib/libqmi_common_so.so \
@@ -203,8 +202,13 @@
             system/lib/libqmi_csvt_srvc.so \
             system/lib/libqmi_encdec.so \
             system/lib/libqmiservices.so \
+            system/lib/libqmi.so \
+            system/lib/libQSEEComAPI.so \
             system/lib/libril-qc-qmi-1.so \
             system/lib/libril-qcril-hook-oem.so \
+            system/lib/librs_adreno_sha1.so \
+            system/lib/librs_adreno.so \
+            system/lib/libRSDriver_adreno.so \
             system/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
@@ -213,7 +217,31 @@
             system/lib/libxml.so \
             system/vendor/firmware/a300_pfp.fw \
             system/vendor/firmware/a300_pm4.fw \
+            system/vendor/firmware/dsps.b00 \
+            system/vendor/firmware/dsps.b01 \
+            system/vendor/firmware/dsps.b02 \
+            system/vendor/firmware/dsps.b03 \
+            system/vendor/firmware/dsps.b04 \
+            system/vendor/firmware/dsps.b05 \
+            system/vendor/firmware/dsps.mdt \
+            system/vendor/firmware/q6.b00 \
+            system/vendor/firmware/q6.b01 \
+            system/vendor/firmware/q6.b03 \
+            system/vendor/firmware/q6.b04 \
+            system/vendor/firmware/q6.b05 \
+            system/vendor/firmware/q6.b06 \
+            system/vendor/firmware/q6.mdt \
+            system/vendor/firmware/wcnss.b00 \
+            system/vendor/firmware/wcnss.b01 \
+            system/vendor/firmware/wcnss.b02 \
+            system/vendor/firmware/wcnss.b04 \
+            system/vendor/firmware/wcnss.b05 \
+            system/vendor/firmware/wcnss.mdt \
             system/vendor/lib/libdrmdecrypt.so \
+            system/vendor/lib/libgeofence.so \
+            system/vendor/lib/libizat_core.so \
+            system/vendor/lib/libloc_api_v02.so \
+            system/vendor/lib/libloc_ds_api.so \
             "
     ;;
   esac
diff --git a/self-extractors/lge/staging/device-partial.mk b/self-extractors/lge/staging/device-partial.mk
index fcad7b1..3490960 100644
--- a/self-extractors/lge/staging/device-partial.mk
+++ b/self-extractors/lge/staging/device-partial.mk
@@ -14,17 +14,10 @@
 
 # LGE blob(s) necessary for Mako hardware
 PRODUCT_COPY_FILES := \
-    vendor/lge/mako/proprietary/DxHDCP.cfg:system/etc/DxHDCP.cfg:lge \
-    vendor/lge/mako/proprietary/libAKM.so:system/lib/libAKM.so:lge \
-    vendor/lge/mako/proprietary/libDxHdcp.so:system/lib/libDxHdcp.so:lge \
     vendor/lge/mako/proprietary/libacdbdata.so:system/lib/libacdbdata.so:lge \
+    vendor/lge/mako/proprietary/libAKM.so:system/lib/libAKM.so:lge \
     vendor/lge/mako/proprietary/libcamera_fast_af.so:system/lib/libcamera_fast_af.so:lge \
     vendor/lge/mako/proprietary/libmorpho_noise_reduction.so:system/lib/libmorpho_noise_reduction.so:lge \
-    vendor/lge/mako/proprietary/dxhdcp2.b00:system/vendor/firmware/discretix/dxhdcp2.b00:lge \
-    vendor/lge/mako/proprietary/dxhdcp2.b01:system/vendor/firmware/discretix/dxhdcp2.b01:lge \
-    vendor/lge/mako/proprietary/dxhdcp2.b02:system/vendor/firmware/discretix/dxhdcp2.b02:lge \
-    vendor/lge/mako/proprietary/dxhdcp2.b03:system/vendor/firmware/discretix/dxhdcp2.b03:lge \
-    vendor/lge/mako/proprietary/dxhdcp2.mdt:system/vendor/firmware/discretix/dxhdcp2.mdt:lge \
     vendor/lge/mako/proprietary/keymaster.b00:system/vendor/firmware/keymaster/keymaster.b00:lge \
     vendor/lge/mako/proprietary/keymaster.b01:system/vendor/firmware/keymaster/keymaster.b01:lge \
     vendor/lge/mako/proprietary/keymaster.b02:system/vendor/firmware/keymaster/keymaster.b02:lge \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index a71e9fd..25e333b 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -43,26 +43,28 @@
     vendor/qcom/mako/proprietary/tzapps.b02:system/etc/firmware/tzapps.b02:qcom \
     vendor/qcom/mako/proprietary/tzapps.b03:system/etc/firmware/tzapps.b03:qcom \
     vendor/qcom/mako/proprietary/tzapps.mdt:system/etc/firmware/tzapps.mdt:qcom \
+    vendor/qcom/mako/proprietary/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw:qcom \
     vendor/qcom/mako/proprietary/vidc.b00:system/etc/firmware/vidc.b00:qcom \
     vendor/qcom/mako/proprietary/vidc.b01:system/etc/firmware/vidc.b01:qcom \
     vendor/qcom/mako/proprietary/vidc.b02:system/etc/firmware/vidc.b02:qcom \
     vendor/qcom/mako/proprietary/vidc.b03:system/etc/firmware/vidc.b03:qcom \
     vendor/qcom/mako/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
-    vendor/qcom/mako/proprietary/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw:qcom \
     vendor/qcom/mako/proprietary/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so:qcom \
-    vendor/qcom/mako/proprietary/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so:qcom \
-    vendor/qcom/mako/proprietary/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so:qcom \
-    vendor/qcom/mako/proprietary/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so:qcom \
-    vendor/qcom/mako/proprietary/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so:qcom \
+    vendor/qcom/mako/proprietary/libEGL_adreno.so:system/lib/egl/libEGL_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libGLESv1_CM_adreno.so:system/lib/egl/libGLESv1_CM_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libGLESv2_adreno.so:system/lib/egl/libGLESv2_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libplayback_adreno.so:system/lib/egl/libplayback_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libq3dtools_adreno.so:system/lib/egl/libq3dtools_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/flp.msm8960.so:system/lib/hw/flp.msm8960.so:qcom \
     vendor/qcom/mako/proprietary/gps.msm8960.so:system/lib/hw/gps.msm8960.so:qcom \
     vendor/qcom/mako/proprietary/sensors.msm8960.so:system/lib/hw/sensors.msm8960.so:qcom \
-    vendor/qcom/mako/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
-    vendor/qcom/mako/proprietary/libCommandSvc.so:system/lib/libCommandSvc.so:qcom \
-    vendor/qcom/mako/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
-    vendor/qcom/mako/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
+    vendor/qcom/mako/proprietary/libadreno_utils.so:system/lib/libadreno_utils.so:qcom \
     vendor/qcom/mako/proprietary/libaudcal.so:system/lib/libaudcal.so:qcom \
     vendor/qcom/mako/proprietary/libaudioalsa.so:system/lib/libaudioalsa.so:qcom \
-    vendor/qcom/mako/proprietary/libc2d2_a3xx.so:system/lib/libc2d2_a3xx.so:qcom \
+    vendor/qcom/mako/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
+    vendor/qcom/mako/proprietary/libc2d30-a3xx.so:system/lib/libc2d30-a3xx.so:qcom \
+    vendor/qcom/mako/proprietary/libc2d30.so:system/lib/libc2d30.so:qcom \
+    vendor/qcom/mako/proprietary/libCB.so:system/lib/libCB.so:qcom \
     vendor/qcom/mako/proprietary/libchromatix_imx111_default_video.so:system/lib/libchromatix_imx111_default_video.so:qcom \
     vendor/qcom/mako/proprietary/libchromatix_imx111_preview.so:system/lib/libchromatix_imx111_preview.so:qcom \
     vendor/qcom/mako/proprietary/libchromatix_imx111_zsl.so:system/lib/libchromatix_imx111_zsl.so:qcom \
@@ -82,6 +84,7 @@
     vendor/qcom/mako/proprietary/libchromatix_s5k4e1_preview.so:system/lib/libchromatix_s5k4e1_preview.so:qcom \
     vendor/qcom/mako/proprietary/libchromatix_vx6953_default_video.so:system/lib/libchromatix_vx6953_default_video.so:qcom \
     vendor/qcom/mako/proprietary/libchromatix_vx6953_preview.so:system/lib/libchromatix_vx6953_preview.so:qcom \
+    vendor/qcom/mako/proprietary/libCommandSvc.so:system/lib/libCommandSvc.so:qcom \
     vendor/qcom/mako/proprietary/libconfigdb.so:system/lib/libconfigdb.so:qcom \
     vendor/qcom/mako/proprietary/libcsd-client.so:system/lib/libcsd-client.so:qcom \
     vendor/qcom/mako/proprietary/libdiag.so:system/lib/libdiag.so:qcom \
@@ -94,30 +97,29 @@
     vendor/qcom/mako/proprietary/libdsucsd.so:system/lib/libdsucsd.so:qcom \
     vendor/qcom/mako/proprietary/libdsutils.so:system/lib/libdsutils.so:qcom \
     vendor/qcom/mako/proprietary/libgemini.so:system/lib/libgemini.so:qcom \
-    vendor/qcom/mako/proprietary/libgeofence.so:system/lib/libgeofence.so:qcom \
     vendor/qcom/mako/proprietary/libgps.utils.so:system/lib/libgps.utils.so:qcom \
     vendor/qcom/mako/proprietary/libgsl.so:system/lib/libgsl.so:qcom \
+    vendor/qcom/mako/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
     vendor/qcom/mako/proprietary/libidl.so:system/lib/libidl.so:qcom \
     vendor/qcom/mako/proprietary/libimage-jpeg-dec-omx-comp.so:system/lib/libimage-jpeg-dec-omx-comp.so:qcom \
     vendor/qcom/mako/proprietary/libimage-jpeg-enc-omx-comp.so:system/lib/libimage-jpeg-enc-omx-comp.so:qcom \
     vendor/qcom/mako/proprietary/libimage-omx-common.so:system/lib/libimage-omx-common.so:qcom \
     vendor/qcom/mako/proprietary/libllvm-a3xx.so:system/lib/libllvm-a3xx.so:qcom \
-    vendor/qcom/mako/proprietary/libloc_adapter.so:system/lib/libloc_adapter.so:qcom \
-    vendor/qcom/mako/proprietary/libloc_api_v02.so:system/lib/libloc_api_v02.so:qcom \
+    vendor/qcom/mako/proprietary/libloc_core.so:system/lib/libloc_core.so:qcom \
     vendor/qcom/mako/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
     vendor/qcom/mako/proprietary/libmercury.so:system/lib/libmercury.so:qcom \
-    vendor/qcom/mako/proprietary/libmm-color-convertor.so:system/lib/libmm-color-convertor.so:qcom \
     vendor/qcom/mako/proprietary/libmmcamera_faceproc.so:system/lib/libmmcamera_faceproc.so:qcom \
     vendor/qcom/mako/proprietary/libmmcamera_frameproc.so:system/lib/libmmcamera_frameproc.so:qcom \
     vendor/qcom/mako/proprietary/libmmcamera_hdr_lib.so:system/lib/libmmcamera_hdr_lib.so:qcom \
     vendor/qcom/mako/proprietary/libmmcamera_image_stab.so:system/lib/libmmcamera_image_stab.so:qcom \
     vendor/qcom/mako/proprietary/libmmcamera_statsproc31.so:system/lib/libmmcamera_statsproc31.so:qcom \
     vendor/qcom/mako/proprietary/libmmcamera_wavelet_lib.so:system/lib/libmmcamera_wavelet_lib.so:qcom \
+    vendor/qcom/mako/proprietary/libmm-color-convertor.so:system/lib/libmm-color-convertor.so:qcom \
     vendor/qcom/mako/proprietary/libmmipl.so:system/lib/libmmipl.so:qcom \
     vendor/qcom/mako/proprietary/libmmjpeg.so:system/lib/libmmjpeg.so:qcom \
     vendor/qcom/mako/proprietary/libmmjps.so:system/lib/libmmjps.so:qcom \
-    vendor/qcom/mako/proprietary/libmmmpo.so:system/lib/libmmmpo.so:qcom \
     vendor/qcom/mako/proprietary/libmmmpod.so:system/lib/libmmmpod.so:qcom \
+    vendor/qcom/mako/proprietary/libmmmpo.so:system/lib/libmmmpo.so:qcom \
     vendor/qcom/mako/proprietary/libmmstillomx.so:system/lib/libmmstillomx.so:qcom \
     vendor/qcom/mako/proprietary/libnetmgr.so:system/lib/libnetmgr.so:qcom \
     vendor/qcom/mako/proprietary/liboemcamera.so:system/lib/liboemcamera.so:qcom \
@@ -125,7 +127,6 @@
     vendor/qcom/mako/proprietary/libqcci_legacy.so:system/lib/libqcci_legacy.so:qcom \
     vendor/qcom/mako/proprietary/libqdi.so:system/lib/libqdi.so:qcom \
     vendor/qcom/mako/proprietary/libqdp.so:system/lib/libqdp.so:qcom \
-    vendor/qcom/mako/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
     vendor/qcom/mako/proprietary/libqmi_cci.so:system/lib/libqmi_cci.so:qcom \
     vendor/qcom/mako/proprietary/libqmi_client_qmux.so:system/lib/libqmi_client_qmux.so:qcom \
     vendor/qcom/mako/proprietary/libqmi_common_so.so:system/lib/libqmi_common_so.so:qcom \
@@ -133,8 +134,13 @@
     vendor/qcom/mako/proprietary/libqmi_csvt_srvc.so:system/lib/libqmi_csvt_srvc.so:qcom \
     vendor/qcom/mako/proprietary/libqmi_encdec.so:system/lib/libqmi_encdec.so:qcom \
     vendor/qcom/mako/proprietary/libqmiservices.so:system/lib/libqmiservices.so:qcom \
+    vendor/qcom/mako/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
+    vendor/qcom/mako/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
     vendor/qcom/mako/proprietary/libril-qc-qmi-1.so:system/lib/libril-qc-qmi-1.so:qcom \
     vendor/qcom/mako/proprietary/libril-qcril-hook-oem.so:system/lib/libril-qcril-hook-oem.so:qcom \
+    vendor/qcom/mako/proprietary/librs_adreno_sha1.so:system/lib/librs_adreno_sha1.so:qcom \
+    vendor/qcom/mako/proprietary/librs_adreno.so:system/lib/librs_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libRSDriver_adreno.so:system/lib/libRSDriver_adreno.so:qcom \
     vendor/qcom/mako/proprietary/libsc-a3xx.so:system/lib/libsc-a3xx.so:qcom \
     vendor/qcom/mako/proprietary/libsensor1.so:system/lib/libsensor1.so:qcom \
     vendor/qcom/mako/proprietary/libsensor_reg.so:system/lib/libsensor_reg.so:qcom \
@@ -143,6 +149,30 @@
     vendor/qcom/mako/proprietary/libxml.so:system/lib/libxml.so:qcom \
     vendor/qcom/mako/proprietary/a300_pfp.fw:system/vendor/firmware/a300_pfp.fw:qcom \
     vendor/qcom/mako/proprietary/a300_pm4.fw:system/vendor/firmware/a300_pm4.fw:qcom \
+    vendor/qcom/mako/proprietary/dsps.b00:system/vendor/firmware/dsps.b00:qcom \
+    vendor/qcom/mako/proprietary/dsps.b01:system/vendor/firmware/dsps.b01:qcom \
+    vendor/qcom/mako/proprietary/dsps.b02:system/vendor/firmware/dsps.b02:qcom \
+    vendor/qcom/mako/proprietary/dsps.b03:system/vendor/firmware/dsps.b03:qcom \
+    vendor/qcom/mako/proprietary/dsps.b04:system/vendor/firmware/dsps.b04:qcom \
+    vendor/qcom/mako/proprietary/dsps.b05:system/vendor/firmware/dsps.b05:qcom \
+    vendor/qcom/mako/proprietary/dsps.mdt:system/vendor/firmware/dsps.mdt:qcom \
+    vendor/qcom/mako/proprietary/q6.b00:system/vendor/firmware/q6.b00:qcom \
+    vendor/qcom/mako/proprietary/q6.b01:system/vendor/firmware/q6.b01:qcom \
+    vendor/qcom/mako/proprietary/q6.b03:system/vendor/firmware/q6.b03:qcom \
+    vendor/qcom/mako/proprietary/q6.b04:system/vendor/firmware/q6.b04:qcom \
+    vendor/qcom/mako/proprietary/q6.b05:system/vendor/firmware/q6.b05:qcom \
+    vendor/qcom/mako/proprietary/q6.b06:system/vendor/firmware/q6.b06:qcom \
+    vendor/qcom/mako/proprietary/q6.mdt:system/vendor/firmware/q6.mdt:qcom \
+    vendor/qcom/mako/proprietary/wcnss.b00:system/vendor/firmware/wcnss.b00:qcom \
+    vendor/qcom/mako/proprietary/wcnss.b01:system/vendor/firmware/wcnss.b01:qcom \
+    vendor/qcom/mako/proprietary/wcnss.b02:system/vendor/firmware/wcnss.b02:qcom \
+    vendor/qcom/mako/proprietary/wcnss.b04:system/vendor/firmware/wcnss.b04:qcom \
+    vendor/qcom/mako/proprietary/wcnss.b05:system/vendor/firmware/wcnss.b05:qcom \
+    vendor/qcom/mako/proprietary/wcnss.mdt:system/vendor/firmware/wcnss.mdt:qcom \
     vendor/qcom/mako/proprietary/libdrmdecrypt.so:system/vendor/lib/libdrmdecrypt.so:qcom \
+    vendor/qcom/mako/proprietary/libgeofence.so:system/vendor/lib/libgeofence.so:qcom \
+    vendor/qcom/mako/proprietary/libizat_core.so:system/vendor/lib/libizat_core.so:qcom \
+    vendor/qcom/mako/proprietary/libloc_api_v02.so:system/vendor/lib/libloc_api_v02.so:qcom \
+    vendor/qcom/mako/proprietary/libloc_ds_api.so:system/vendor/lib/libloc_ds_api.so:qcom \
 
 PRODUCT_PACKAGES := libacdbloader
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index ff5f826..095b762 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -15,22 +15,52 @@
 system/vendor/firmware/discretix/dxhdcp2.mdt:lge
 system/bin/efsks:qcom
 system/bin/hci_qcomm_init:qcom
+system/bin/mm-qcamera-app:qcom
+system/vendor/firmware/dsps.b00:qcom
+system/vendor/firmware/dsps.b01:qcom
+system/vendor/firmware/dsps.b02:qcom
+system/vendor/firmware/dsps.b03:qcom
+system/vendor/firmware/dsps.b04:qcom
+system/vendor/firmware/dsps.b05:qcom
+system/vendor/firmware/dsps.mdt:qcom
 system/vendor/firmware/keymaster/keymaster.b00:lge
 system/vendor/firmware/keymaster/keymaster.b01:lge
 system/vendor/firmware/keymaster/keymaster.b02:lge
 system/vendor/firmware/keymaster/keymaster.b03:lge
 system/vendor/firmware/keymaster/keymaster.mdt:lge
+system/vendor/firmware/q6.b00:qcom
+system/vendor/firmware/q6.b01:qcom
+system/vendor/firmware/q6.b03:qcom
+system/vendor/firmware/q6.b04:qcom
+system/vendor/firmware/q6.b05:qcom
+system/vendor/firmware/q6.b06:qcom
+system/vendor/firmware/q6.mdt:qcom
+system/vendor/firmware/wcnss.b00:qcom
+system/vendor/firmware/wcnss.b01:qcom
+system/vendor/firmware/wcnss.b02:qcom
+system/vendor/firmware/wcnss.b04:qcom
+system/vendor/firmware/wcnss.b05:qcom
+system/vendor/firmware/wcnss.mdt:qcom
 system/bin/ks:qcom
+system/lib/egl/libEGL_adreno.so:qcom
+system/lib/egl/libGLESv1_CM_adreno.so:qcom
+system/lib/egl/libGLESv2_adreno.so:qcom
+system/lib/egl/libplayback_adreno.so:qcom
+system/lib/egl/libq3dtools_adreno.so:qcom
 system/lib/libAKM.so:lge
+system/lib/libCB.so:qcom
 system/lib/libCommandSvc.so:qcom
 system/lib/libDxHdcp.so:lge
 system/lib/libI420colorconvert.so:qcom
 system/lib/libQSEEComAPI.so:qcom
 system/lib/libacdbdata.so:lge
 system/lib/libacdbloader.so:qcom
+system/lib/libadreno_utils.so:qcom
 system/lib/libaudcal.so:qcom
 system/lib/libaudioalsa.so:qcom
 system/lib/libcamera_fast_af.so:lge
+system/lib/libc2d30-a3xx.so:qcom
+system/lib/libc2d30.so:qcom
 system/lib/libchromatix_imx111_default_video.so:qcom
 system/lib/libchromatix_imx111_preview.so:qcom
 system/lib/libchromatix_imx111_zsl.so:qcom
@@ -54,9 +84,16 @@
 system/lib/libcsd-client.so:qcom
 system/lib/libdiag.so:qcom
 system/vendor/lib/libdrmdecrypt.so:qcom
+system/vendor/lib/libgeofence.so:qcom
+system/vendor/lib/libizat_core.so:qcom
+system/vendor/lib/libloc_api_v02.so:qcom
+system/vendor/lib/libloc_ds_api.so:qcom
 system/lib/libdrmdiag.so:qcom
 system/lib/libdrmfs.so:qcom
 system/lib/libdrmtime.so:qcom
+system/lib/librs_adreno_sha1.so:qcom
+system/lib/librs_adreno.so:qcom
+system/lib/libRSDriver_adreno.so:qcom
 system/lib/libdsi_netctrl.so:qcom
 system/lib/libdsprofile.so:qcom
 system/lib/libdss.so:qcom
@@ -67,6 +104,7 @@
 system/lib/libimage-jpeg-enc-omx-comp.so:qcom
 system/lib/libimage-omx-common.so:qcom
 system/lib/libloc_api_v02.so:qcom
+system/lib/libloc_core.so:qcom
 system/lib/libmm-color-convertor.so:qcom
 system/lib/libmmcamera_faceproc.so:qcom
 system/lib/libmmcamera_frameproc.so:qcom
@@ -108,6 +146,7 @@
 system/bin/qseecomd:qcom
 system/bin/radish:qcom
 system/bin/rmt_storage:qcom
+system/lib/hw/flp.msm8960.so:qcom
 system/lib/hw/sensors.msm8960.so:qcom
 system/bin/sensors.qcom:qcom
 system/bin/thermald:qcom