evert: Move more camera blobs to vendor

* libSonyDefocus and ZAF configs

Change-Id: I87bb12d041476df3e62a9573915e1618553b7c03
Signed-off-by: Erfan Abdi <erfangplus@gmail.com>

extract-files.sh

@@ -17,6 +17,12 @@
 
 set -e
 
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
+
+LINEAGE_ROOT="$MY_DIR"/../../..
+
 export DEVICE=evert
 export DEVICE_COMMON=sdm660-common
 export VENDOR=motorola
@@ -24,3 +30,13 @@ export VENDOR=motorola
 export DEVICE_BRINGUP_YEAR=2018
 
 ./../../$VENDOR/$DEVICE_COMMON/extract-files.sh $@
+
+BLOB_ROOT="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary
+
+# Load libSonyDefocus from vendor
+CAMERA_IMX386="$BLOB_ROOT"/vendor/lib/libmmcamera_imx386.so
+sed -i "s|/system/lib/hw/|/vendor/lib/hw/|g" "$CAMERA_IMX386"
+
+# Load ZAF configs from vendor
+ZAF_CORE="$BLOB_ROOT"/vendor/lib/libzaf_core.so
+sed -i "s|/system/etc/zaf|/vendor/etc/zaf|g" "$ZAF_CORE"

proprietary-files.txt

@@ -20,10 +20,10 @@ vendor/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_593.xml
 vendor/etc/qdcm_calib_data_mipi_mot_vid_djn_1080p_593.xml
 
 # Camera
-etc/zaf/zaf_mot_s5k2l7sa.json
-etc/zaf/zaf_imx386.json
-etc/zaf/zaf_imx386_mono.json
-lib/hw/libSonyDefocus.so
+etc/zaf/zaf_mot_s5k2l7sa.json:vendor/etc/zaf/zaf_mot_s5k2l7sa.json
+etc/zaf/zaf_imx386.json:vendor/etc/zaf/zaf_imx386.json
+etc/zaf/zaf_imx386_mono.json:vendor/etc/zaf/zaf_imx386_mono.json
+lib/hw/libSonyDefocus.so:vendor/lib/hw/libSonyDefocus.so
 vendor/lib/hw/camera.sdm660.so
 vendor/lib/libhal_dbg.so
 vendor/lib/libactuator_mot_ak7371.so