Update blob scripts to reflect GL libraries move
BUG: 17260357
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index c957149..6e2a3a2 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -57,25 +57,25 @@
/system/etc/firmware/wcd9310/wcd9310_anc.bin
/system/etc/firmware/wcd9310/wcd9310_mbhc.bin
/system/etc/gps.conf
-/system/lib/egl/eglsubAndroid.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/vendor/lib/egl/eglsubAndroid.so
+/system/vendor/lib/egl/libEGL_adreno.so
+/system/vendor/lib/egl/libGLESv1_CM_adreno.so
+/system/vendor/lib/egl/libGLESv2_adreno.so
+/system/vendor/lib/egl/libplayback_adreno.so
+/system/vendor/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/libacdbdata.so
/system/lib/libacdbloader.so
-/system/lib/libadreno_utils.so
+/system/vendor/lib/libadreno_utils.so
/system/lib/libAKM.so
/system/lib/libaudcal.so
/system/lib/libaudioalsa.so
-/system/lib/libC2D2.so
-/system/lib/libc2d30-a3xx.so
-/system/lib/libc2d30.so
-/system/lib/libCB.so
+/system/vendor/lib/libC2D2.so
+/system/vendor/lib/libc2d30-a3xx.so
+/system/vendor/lib/libc2d30.so
+/system/vendor/lib/libCB.so
/system/lib/libchromatix_ov5693_common.so
/system/lib/libchromatix_ov5693_default_video.so
/system/lib/libchromatix_ov5693_preview.so
@@ -93,10 +93,10 @@
/system/lib/libdsutils.so
/system/lib/libDxHdcp.so
/system/lib/libgps.utils.so
-/system/lib/libgsl.so
+/system/vendor/lib/libgsl.so
/system/lib/libI420colorconvert.so
/system/lib/libidl.so
-/system/lib/libllvm-qcom.so
+/system/vendor/lib/libllvm-qcom.so
/system/lib/libloc_core.so
/system/lib/libloc_eng.so
/system/lib/libmm-abl.so
@@ -121,10 +121,10 @@
/system/lib/libQSEEComAPI.so
/system/lib/libril-qc-qmi-1.so
/system/lib/libril-qcril-hook-oem.so
-/system/lib/libRSDriver_adreno.so
-/system/lib/librs_adreno.so
-/system/lib/librs_adreno_sha1.so
-/system/lib/libsc-a3xx.so
+/system/vendor/lib/libRSDriver_adreno.so
+/system/vendor/lib/librs_adreno.so
+/system/vendor/lib/librs_adreno_sha1.so
+/system/vendor/lib/libsc-a3xx.so
/system/lib/libsensor1.so
/system/lib/libsensor_reg.so
/system/lib/libsensor_user_cal.so
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 15a03c8..c5edc63 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -48,23 +48,23 @@
system/etc/firmware/vidcfw.elf \
system/etc/firmware/vidc.mdt \
system/etc/gps.conf \
- system/lib/egl/eglsubAndroid.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/vendor/lib/egl/eglsubAndroid.so \
+ system/vendor/lib/egl/libEGL_adreno.so \
+ system/vendor/lib/egl/libGLESv1_CM_adreno.so \
+ system/vendor/lib/egl/libGLESv2_adreno.so \
+ system/vendor/lib/egl/libplayback_adreno.so \
+ system/vendor/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/libacdbloader.so \
- system/lib/libadreno_utils.so \
+ system/vendor/lib/libadreno_utils.so \
system/lib/libaudcal.so \
system/lib/libaudioalsa.so \
- system/lib/libC2D2.so \
- system/lib/libc2d30-a3xx.so \
- system/lib/libc2d30.so \
- system/lib/libCB.so \
+ system/vendor/lib/libC2D2.so \
+ system/vendor/lib/libc2d30-a3xx.so \
+ system/vendor/lib/libc2d30.so \
+ system/vendor/lib/libCB.so \
system/lib/libchromatix_ov5693_common.so \
system/lib/libchromatix_ov5693_default_video.so \
system/lib/libchromatix_ov5693_preview.so \
@@ -82,10 +82,10 @@
system/lib/libdsutils.so \
system/lib/libDxHdcp.so \
system/lib/libgps.utils.so \
- system/lib/libgsl.so \
+ system/vendor/lib/libgsl.so \
system/lib/libI420colorconvert.so \
system/lib/libidl.so \
- system/lib/libllvm-qcom.so \
+ system/vendor/lib/libllvm-qcom.so \
system/lib/libloc_core.so \
system/lib/libloc_eng.so \
system/lib/libmm-abl.so \
@@ -110,10 +110,10 @@
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/vendor/lib/librs_adreno_sha1.so \
+ system/vendor/lib/librs_adreno.so \
+ system/vendor/lib/libRSDriver_adreno.so \
+ system/vendor/lib/libsc-a3xx.so \
system/lib/libsensor1.so \
system/lib/libsensor_reg.so \
system/lib/libsensor_user_cal.so \
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index d132719..a4c065b 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -101,23 +101,23 @@
system/etc/firmware/vidcfw.elf \
system/etc/firmware/vidc.mdt \
system/etc/gps.conf \
- system/lib/egl/eglsubAndroid.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/vendor/lib/egl/eglsubAndroid.so \
+ system/vendor/lib/egl/libEGL_adreno.so \
+ system/vendor/lib/egl/libGLESv1_CM_adreno.so \
+ system/vendor/lib/egl/libGLESv2_adreno.so \
+ system/vendor/lib/egl/libplayback_adreno.so \
+ system/vendor/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/libacdbloader.so \
- system/lib/libadreno_utils.so \
+ system/vendor/lib/libadreno_utils.so \
system/lib/libaudcal.so \
system/lib/libaudioalsa.so \
- system/lib/libC2D2.so \
- system/lib/libc2d30-a3xx.so \
- system/lib/libc2d30.so \
- system/lib/libCB.so \
+ system/vendor/lib/libC2D2.so \
+ system/vendor/lib/libc2d30-a3xx.so \
+ system/vendor/lib/libc2d30.so \
+ system/vendor/lib/libCB.so \
system/lib/libchromatix_ov5693_common.so \
system/lib/libchromatix_ov5693_default_video.so \
system/lib/libchromatix_ov5693_preview.so \
@@ -135,10 +135,10 @@
system/lib/libdsutils.so \
system/lib/libDxHdcp.so \
system/lib/libgps.utils.so \
- system/lib/libgsl.so \
+ system/vendor/lib/libgsl.so \
system/lib/libI420colorconvert.so \
system/lib/libidl.so \
- system/lib/libllvm-qcom.so \
+ system/vendor/lib/libllvm-qcom.so \
system/lib/libloc_core.so \
system/lib/libloc_eng.so \
system/lib/libmm-abl.so \
@@ -163,10 +163,10 @@
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/vendor/lib/librs_adreno_sha1.so \
+ system/vendor/lib/librs_adreno.so \
+ system/vendor/lib/libRSDriver_adreno.so \
+ system/vendor/lib/libsc-a3xx.so \
system/lib/libsensor1.so \
system/lib/libsensor_reg.so \
system/lib/libsensor_user_cal.so \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 07267cc..dbf4264 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -49,22 +49,22 @@
vendor/qcom/deb/proprietary/vidcfw.elf:system/etc/firmware/vidcfw.elf:qcom \
vendor/qcom/deb/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
vendor/qcom/deb/proprietary/gps.conf:system/etc/gps.conf:qcom \
- vendor/qcom/deb/proprietary/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so:qcom \
- vendor/qcom/deb/proprietary/libEGL_adreno.so:system/lib/egl/libEGL_adreno.so:qcom \
- vendor/qcom/deb/proprietary/libGLESv1_CM_adreno.so:system/lib/egl/libGLESv1_CM_adreno.so:qcom \
- vendor/qcom/deb/proprietary/libGLESv2_adreno.so:system/lib/egl/libGLESv2_adreno.so:qcom \
- vendor/qcom/deb/proprietary/libplayback_adreno.so:system/lib/egl/libplayback_adreno.so:qcom \
- vendor/qcom/deb/proprietary/libq3dtools_adreno.so:system/lib/egl/libq3dtools_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/eglsubAndroid.so:system/vendor/lib/egl/eglsubAndroid.so:qcom \
+ vendor/qcom/deb/proprietary/libEGL_adreno.so:system/vendor/lib/egl/libEGL_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/libGLESv1_CM_adreno.so:system/vendor/lib/egl/libGLESv1_CM_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/libGLESv2_adreno.so:system/vendor/lib/egl/libGLESv2_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/libplayback_adreno.so:system/vendor/lib/egl/libplayback_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/libq3dtools_adreno.so:system/vendor/lib/egl/libq3dtools_adreno.so:qcom \
vendor/qcom/deb/proprietary/flp.msm8960.so:system/lib/hw/flp.msm8960.so:qcom \
vendor/qcom/deb/proprietary/gps.msm8960.so:system/lib/hw/gps.msm8960.so:qcom \
vendor/qcom/deb/proprietary/sensors.msm8960.so:system/lib/hw/sensors.msm8960.so:qcom \
- vendor/qcom/deb/proprietary/libadreno_utils.so:system/lib/libadreno_utils.so:qcom \
+ vendor/qcom/deb/proprietary/libadreno_utils.so:system/vendor/lib/libadreno_utils.so:qcom \
vendor/qcom/deb/proprietary/libaudcal.so:system/lib/libaudcal.so:qcom \
vendor/qcom/deb/proprietary/libaudioalsa.so:system/lib/libaudioalsa.so:qcom \
- vendor/qcom/deb/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
- vendor/qcom/deb/proprietary/libc2d30-a3xx.so:system/lib/libc2d30-a3xx.so:qcom \
- vendor/qcom/deb/proprietary/libc2d30.so:system/lib/libc2d30.so:qcom \
- vendor/qcom/deb/proprietary/libCB.so:system/lib/libCB.so:qcom \
+ vendor/qcom/deb/proprietary/libC2D2.so:system/vendor/lib/libC2D2.so:qcom \
+ vendor/qcom/deb/proprietary/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so:qcom \
+ vendor/qcom/deb/proprietary/libc2d30.so:system/vendor/lib/libc2d30.so:qcom \
+ vendor/qcom/deb/proprietary/libCB.so:system/vendor/lib/libCB.so:qcom \
vendor/qcom/deb/proprietary/libchromatix_ov5693_common.so:system/lib/libchromatix_ov5693_common.so:qcom \
vendor/qcom/deb/proprietary/libchromatix_ov5693_default_video.so:system/lib/libchromatix_ov5693_default_video.so:qcom \
vendor/qcom/deb/proprietary/libchromatix_ov5693_preview.so:system/lib/libchromatix_ov5693_preview.so:qcom \
@@ -82,10 +82,10 @@
vendor/qcom/deb/proprietary/libdsutils.so:system/lib/libdsutils.so:qcom \
vendor/qcom/deb/proprietary/libDxHdcp.so:system/lib/libDxHdcp.so:qcom \
vendor/qcom/deb/proprietary/libgps.utils.so:system/lib/libgps.utils.so:qcom \
- vendor/qcom/deb/proprietary/libgsl.so:system/lib/libgsl.so:qcom \
+ vendor/qcom/deb/proprietary/libgsl.so:system/vendor/lib/libgsl.so:qcom \
vendor/qcom/deb/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
vendor/qcom/deb/proprietary/libidl.so:system/lib/libidl.so:qcom \
- vendor/qcom/deb/proprietary/libllvm-qcom.so:system/lib/libllvm-qcom.so:qcom \
+ vendor/qcom/deb/proprietary/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so:qcom \
vendor/qcom/deb/proprietary/libloc_core.so:system/lib/libloc_core.so:qcom \
vendor/qcom/deb/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
vendor/qcom/deb/proprietary/libmm-abl.so:system/lib/libmm-abl.so:qcom \
@@ -110,10 +110,10 @@
vendor/qcom/deb/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
vendor/qcom/deb/proprietary/libril-qc-qmi-1.so:system/lib/libril-qc-qmi-1.so:qcom \
vendor/qcom/deb/proprietary/libril-qcril-hook-oem.so:system/lib/libril-qcril-hook-oem.so:qcom \
- vendor/qcom/deb/proprietary/librs_adreno_sha1.so:system/lib/librs_adreno_sha1.so:qcom \
- vendor/qcom/deb/proprietary/librs_adreno.so:system/lib/librs_adreno.so:qcom \
- vendor/qcom/deb/proprietary/libRSDriver_adreno.so:system/lib/libRSDriver_adreno.so:qcom \
- vendor/qcom/deb/proprietary/libsc-a3xx.so:system/lib/libsc-a3xx.so:qcom \
+ vendor/qcom/deb/proprietary/librs_adreno_sha1.so:system/vendor/lib/librs_adreno_sha1.so:qcom \
+ vendor/qcom/deb/proprietary/librs_adreno.so:system/vendor/lib/librs_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so:qcom \
+ vendor/qcom/deb/proprietary/libsc-a3xx.so:system/vendor/lib/libsc-a3xx.so:qcom \
vendor/qcom/deb/proprietary/libsensor1.so:system/lib/libsensor1.so:qcom \
vendor/qcom/deb/proprietary/libsensor_reg.so:system/lib/libsensor_reg.so:qcom \
vendor/qcom/deb/proprietary/libsensor_user_cal.so:system/lib/libsensor_user_cal.so:qcom \
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index 3887086..61f3efd 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -46,25 +46,25 @@
system/bin/irsc_util:qcom
system/bin/ks:qcom
system/etc/gps.conf: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/vendor/lib/egl/libEGL_adreno.so:qcom
+system/vendor/lib/egl/libGLESv1_CM_adreno.so:qcom
+system/vendor/lib/egl/libGLESv2_adreno.so:qcom
+system/vendor/lib/egl/libplayback_adreno.so:qcom
+system/vendor/lib/egl/libq3dtools_adreno.so:qcom
system/lib/libAKM.so:asus
-system/lib/libCB.so:qcom
+system/vendor/lib/libCB.so:qcom
system/lib/libCommandSvc.so:qcom
system/lib/libDxHdcp.so:qcom
system/lib/libI420colorconvert.so:qcom
system/lib/libQSEEComAPI.so:qcom
-system/lib/libRSDriver_adreno.so:qcom
+system/vendor/lib/libRSDriver_adreno.so:qcom
system/lib/libacdbdata.so:asus
system/lib/libacdbloader.so:qcom
-system/lib/libadreno_utils.so:qcom
+system/vendor/lib/libadreno_utils.so:qcom
system/lib/libaudcal.so:qcom
system/lib/libaudioalsa.so:qcom
-system/lib/libc2d30-a3xx.so:qcom
-system/lib/libc2d30.so:qcom
+system/vendor/lib/libc2d30-a3xx.so:qcom
+system/vendor/lib/libc2d30.so:qcom
system/lib/libchromatix_ov5693_common.so:qcom
system/lib/libchromatix_ov5693_default_video.so:qcom
system/lib/libchromatix_ov5693_preview.so:qcom
@@ -110,8 +110,8 @@
system/lib/libnetmgr.so:qcom
system/vendor/lib/liboemcamera.so:qcom
system/lib/liboemcrypto.so:qcom
-system/lib/librs_adreno_sha1.so:qcom
-system/lib/librs_adreno.so:qcom
+system/vendor/lib/librs_adreno_sha1.so:qcom
+system/vendor/lib/librs_adreno.so:qcom
system/lib/libqcci_legacy.so:qcom
system/lib/libqdi.so:qcom
system/lib/libqdp.so:qcom
@@ -178,16 +178,16 @@
system/vendor/firmware/a300_pm4.fw:qcom
system/etc/debugger.conf:asus
system/lib/egl/eglsubAndroid.so:qcom
-system/lib/libC2D2.so:qcom
+system/vendor/lib/libC2D2.so:qcom
system/lib/egl/libEGL_adreno200.so:qcom
system/lib/egl/libGLESv1_CM_adreno200.so:qcom
system/lib/egl/libGLESv2_adreno200.so:qcom
system/lib/libc2d2_a3xx.so:qcom
system/lib/libdebugger_jni.so:asus
-system/lib/libgsl.so:qcom
-system/lib/libllvm-qcom.so:qcom
+system/vendor/lib/libgsl.so:qcom
+system/vendor/lib/libllvm-qcom.so:qcom
system/lib/egl/libq3dtools_adreno200.so:qcom
-system/lib/libsc-a3xx.so:qcom
+system/vendor/lib/libsc-a3xx.so:qcom
system/lib/libgeofence.so:qcom
system/lib/libidl.so:qcom
system/vendor/lib/libmmcamera2_c2d_module.so:qcom
