Update blob scripts to reflect GL libraries move

BUG: 17260357

5 files changed, 89 insertions, 89 deletions

diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 11e2cf3..1ab7afc 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -51,26 +51,26 @@
 /system/etc/firmware/vidc_1080p.fw
 /system/etc/firmware/wcd9310/wcd9310_anc.bin
 /system/etc/firmware/wcd9310/wcd9310_mbhc.bin
-/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/vendor/lib/libC2D2.so
+/system/vendor/lib/libc2d30-a3xx.so
+/system/vendor/lib/libc2d30.so
 /system/lib/libcamera_fast_af.so
-/system/lib/libCB.so
+/system/vendor/lib/libCB.so
 /system/lib/libchromatix_imx111_default_video.so
 /system/lib/libchromatix_imx111_preview.so
 /system/lib/libchromatix_imx111_zsl.so
@@ -104,14 +104,14 @@
 /system/lib/libdsutils.so
 /system/lib/libgemini.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/libimage-jpeg-dec-omx-comp.so
 /system/lib/libimage-jpeg-enc-omx-comp.so
 /system/lib/libimage-omx-common.so
-/system/lib/libllvm-qcom.so
-/system/lib/libbccQTI.so
+/system/vendor/lib/libllvm-qcom.so
+/system/vendor/lib/libbccQTI.so
 /system/lib/libloc_core.so
 /system/lib/libloc_eng.so
 /system/lib/libmercury.so
@@ -146,10 +146,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 566a3f9..a0b455c 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -54,23 +54,23 @@
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
             system/etc/firmware/vidc.mdt \
-            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_imx111_default_video.so \
             system/lib/libchromatix_imx111_preview.so \
             system/lib/libchromatix_imx111_zsl.so \
@@ -104,14 +104,14 @@
             system/lib/libdsutils.so \
             system/lib/libgemini.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/libimage-jpeg-dec-omx-comp.so \
             system/lib/libimage-jpeg-enc-omx-comp.so \
             system/lib/libimage-omx-common.so \
-            system/lib/libllvm-qcom.so \
-            system/lib/libbccQTI.so \
+            system/vendor/lib/libllvm-qcom.so \
+            system/vendor/lib/libbccQTI.so \
             system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
             system/lib/libmercury.so \
@@ -145,10 +145,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 615eeb4..f52b35f 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -116,23 +116,23 @@ do
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
             system/etc/firmware/vidc.mdt \
-            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_imx111_default_video.so \
             system/lib/libchromatix_imx111_preview.so \
             system/lib/libchromatix_imx111_zsl.so \
@@ -166,14 +166,14 @@ do
             system/lib/libdsutils.so \
             system/lib/libgemini.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/libimage-jpeg-dec-omx-comp.so \
             system/lib/libimage-jpeg-enc-omx-comp.so \
             system/lib/libimage-omx-common.so \
-            system/lib/libllvm-qcom.so \
-            system/lib/libbccQTI.so \
+            system/vendor/lib/libllvm-qcom.so \
+            system/vendor/lib/libbccQTI.so \
             system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
             system/lib/libmercury.so \
@@ -207,10 +207,10 @@ do
             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 31e45cd..3eb75d8 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -49,22 +49,22 @@ PRODUCT_COPY_FILES := \
     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/eglsubAndroid.so:system/lib/egl/eglsubAndroid.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/eglsubAndroid.so:system/vendor/lib/egl/eglsubAndroid.so:qcom \
+    vendor/qcom/mako/proprietary/libEGL_adreno.so:system/vendor/lib/egl/libEGL_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libGLESv1_CM_adreno.so:system/vendor/lib/egl/libGLESv1_CM_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libGLESv2_adreno.so:system/vendor/lib/egl/libGLESv2_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libplayback_adreno.so:system/vendor/lib/egl/libplayback_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libq3dtools_adreno.so:system/vendor/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/libadreno_utils.so:system/lib/libadreno_utils.so:qcom \
+    vendor/qcom/mako/proprietary/libadreno_utils.so:system/vendor/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.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/libC2D2.so:system/vendor/lib/libC2D2.so:qcom \
+    vendor/qcom/mako/proprietary/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so:qcom \
+    vendor/qcom/mako/proprietary/libc2d30.so:system/vendor/lib/libc2d30.so:qcom \
+    vendor/qcom/mako/proprietary/libCB.so:system/vendor/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 \
@@ -98,14 +98,14 @@ PRODUCT_COPY_FILES := \
     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/libgps.utils.so:system/lib/libgps.utils.so:qcom \
-    vendor/qcom/mako/proprietary/libgsl.so:system/lib/libgsl.so:qcom \
+    vendor/qcom/mako/proprietary/libgsl.so:system/vendor/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-qcom.so:system/lib/libllvm-qcom.so:qcom \
-    vendor/qcom/mako/proprietary/libbccQTI.so:system/lib/libbccQTI.so:qcom \
+    vendor/qcom/mako/proprietary/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so:qcom \
+    vendor/qcom/mako/proprietary/libbccQTI.so:system/vendor/lib/libbccQTI.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 \
@@ -139,10 +139,10 @@ PRODUCT_COPY_FILES := \
     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/librs_adreno_sha1.so:system/vendor/lib/librs_adreno_sha1.so:qcom \
+    vendor/qcom/mako/proprietary/librs_adreno.so:system/vendor/lib/librs_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so:qcom \
+    vendor/qcom/mako/proprietary/libsc-a3xx.so:system/vendor/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 \
     vendor/qcom/mako/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 256d8a9..74ab8a2 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -42,25 +42,25 @@ 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/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:lge
-system/lib/libCB.so:qcom
+system/vendor/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/vendor/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/vendor/lib/libc2d30-a3xx.so:qcom
+system/vendor/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
@@ -91,9 +91,9 @@ 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/vendor/lib/librs_adreno_sha1.so:qcom
+system/vendor/lib/librs_adreno.so:qcom
+system/vendor/lib/libRSDriver_adreno.so:qcom
 system/lib/libdsi_netctrl.so:qcom
 system/lib/libdsprofile.so:qcom
 system/lib/libdss.so:qcom
@@ -167,16 +167,16 @@ system/etc/firmware/vidc_1080p.fw:qcom
 system/vendor/firmware/a300_pfp.fw:qcom
 system/vendor/firmware/a300_pm4.fw:qcom
 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/libgsl.so:qcom
-system/lib/libllvm-qcom.so:qcom
-system/lib/libbccQTI.so:qcom
+system/vendor/lib/libgsl.so:qcom
+system/vendor/lib/libllvm-qcom.so:qcom
+system/vendor/lib/libbccQTI.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/lib/libmercury.so:qcom