From 423d0374778cb8d7727e8a22f3f41280d7c9390b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 5 Feb 2019 15:38:35 +0100 Subject: msm8996-common: Hex edit camera blobs to use /data/vendor/qcam Signed-off-by: Davide Garberi Change-Id: I0ca268ec4cf71f80a5e341f0131c239ae0dd66fd --- camera/QCamera2/stack/common/cam_types.h | 2 +- extract-files.sh | 24 ++++++++++++++++++++++++ rootdir/etc/init.qcom.rc | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/camera/QCamera2/stack/common/cam_types.h b/camera/QCamera2/stack/common/cam_types.h index e0da597..d085d58 100644 --- a/camera/QCamera2/stack/common/cam_types.h +++ b/camera/QCamera2/stack/common/cam_types.h @@ -113,7 +113,7 @@ #define MAX_INFLIGHT_HFR_REQUESTS (48) #define MIN_INFLIGHT_HFR_REQUESTS (40) -#define QCAMERA_DUMP_FRM_LOCATION "/data/vendor/camera/" +#define QCAMERA_DUMP_FRM_LOCATION "/data/vendor/qcam/" #define QCAMERA_MAX_FILEPATH_LENGTH 64 #define LIKELY(x) __builtin_expect((x), true) diff --git a/extract-files.sh b/extract-files.sh index c48b61d..a3f8774 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -87,4 +87,28 @@ sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib64/libSecure # Hex edit /bt_firmware to /vendor/btfw to delete the outdated rootdir symlinks sed -i "s|/bt_firmware|/vendor/btfw|g" "$BLOB_ROOT"/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so +# Hex edit camera blobs to use /data/vendor/qcam +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/bin/mm-qcamera-daemon +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmm-qcamera.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_cpp_module.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_iface_modules.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_imglib_modules.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_mct.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_pproc_modules.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_sensor_modules.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_stats_algorithm.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera2_stats_modules.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_dbg.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_hvx_grid_sum.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_hvx_zzHDR.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_imglib.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_isp_mesh_rolloff44.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_pdaf.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_pdafcamif.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_tintless_algo.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_tintless_bg_pca_algo.so +sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_tuning.so + +sed -i "s|/data/vendor/camera/cam_socket%d|/data/vendor/qcam/camer_socket%d|g" "$BLOB_ROOT"/vendor/bin/mm-qcamera-daemon + "$MY_DIR"/setup-makefiles.sh diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 5e8dd1e..fa88f5a 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -101,7 +101,7 @@ on post-fs-data mkdir /data/vendor/tombstones 0771 system system # Create folder for mm-qcamera-daemon - mkdir /data/vendor/camera 0770 camera camera + mkdir /data/vendor/qcam 0770 camera camera mkdir /data/media 0770 media_rw media_rw chown media_rw media_rw /data/media -- cgit v1.2.3