From a87329a49b96cb5b5d323a86f87a49c756c1da68 Mon Sep 17 00:00:00 2001
From: Erfan Abdi <erfangplus@gmail.com>
Date: Mon, 26 Nov 2018 15:33:41 +0200
Subject: [PATCH] beckham: update blob list
Signed-off-by: Erfan Abdi <erfangplus@gmail.com>
---
extract-files.sh | 11 -----
proprietary-files.txt | 104 ++++++------------------------------------
vendor_prop.mk | 30 ++++++------
3 files changed, 30 insertions(+), 115 deletions(-)
diff --git a/extract-files.sh b/extract-files.sh
index e6fe7f1..0490c1d 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -33,17 +33,6 @@ export DEVICE_BRINGUP_YEAR=2018
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"
-
-# Using in vendor libgui for O cam blobs
-sed -i "s|libgui.so|libPui.so|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_ppeiscore.so
-sed -i "s|libgui.so|libPui.so|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_vstab_module.so
-
-# Using patchelf to add cam shims
-patchelf --add-needed libcamera_hal_shim.so "$BLOB_ROOT"/vendor/lib/hw/camera.sdm660.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c8cb1cc..65cc385 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,29 +1,21 @@
# Audio ACDB
-vendor/etc/acdbdata/common/Bluetooth_cal.acdb
-vendor/etc/acdbdata/common/General_cal.acdb
-vendor/etc/acdbdata/common/Global_cal.acdb
-vendor/etc/acdbdata/common/Handset_cal.acdb
-vendor/etc/acdbdata/common/Hdmi_cal.acdb
-vendor/etc/acdbdata/common/Headset_cal.acdb
-vendor/etc/acdbdata/common/Speaker_cal.acdb
-vendor/etc/acdbdata/idn/Bluetooth_cal.acdb
-vendor/etc/acdbdata/idn/General_cal.acdb
-vendor/etc/acdbdata/idn/Global_cal.acdb
-vendor/etc/acdbdata/idn/Handset_cal.acdb
-vendor/etc/acdbdata/idn/Hdmi_cal.acdb
-vendor/etc/acdbdata/idn/Headset_cal.acdb
-vendor/etc/acdbdata/idn/Speaker_cal.acdb
+etc/acdbdata/Bluetooth_cal.acdb:vendor/etc/acdbdata/Bluetooth_cal.acdb
+etc/acdbdata/General_cal.acdb:vendor/etc/acdbdata/General_cal.acdb
+etc/acdbdata/Global_cal.acdb:vendor/etc/acdbdata/Global_cal.acdb
+etc/acdbdata/Handset_cal.acdb:vendor/etc/acdbdata/Handset_cal.acdb
+etc/acdbdata/Hdmi_cal.acdb:vendor/etc/acdbdata/Hdmi_cal.acdb
+etc/acdbdata/Headset_cal.acdb:vendor/etc/acdbdata/Headset_cal.acdb
+etc/acdbdata/Speaker_cal.acdb:vendor/etc/acdbdata/Speaker_cal.acdb
# Display calib
-vendor/etc/qdcm_calib_data_mipi_mot_vid_auo_1080p_593.xml
-vendor/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_593.xml
-vendor/etc/qdcm_calib_data_mipi_mot_vid_djn_1080p_593.xml
+vendor/etc/qdcm_calib_data_mipi_mot_cmd_smd_1080p_601.xml
+vendor/etc/qdcm_calib_data_mipi_mot_cmd_tianma_1080p_601.xml
# Camera
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/libSonyDefocus.so
vendor/lib/hw/camera.sdm660.so
vendor/lib/libhal_dbg.so
vendor/lib/libactuator_mot_ak7371.so
@@ -31,6 +23,7 @@ vendor/lib/libflash_aw3643_rear.so
vendor/lib/libflash_aw3643_front.so
vendor/lib/libflash_pmic.so
vendor/lib/libgralloc1.so
+vendor/lib/libgui_vendor.so|2289516454cceae50bb3963f9255bc113a24b508
vendor/lib/libjpegdhw.so
vendor/lib/libjpegdmahw.so
vendor/lib/libjpegehw.so
@@ -45,16 +38,11 @@ vendor/lib/libqomx_jpegenc_pipe.so
vendor/lib/libqomx_jpegenc.so
vendor/lib/libremosaic_daemon.so
vendor/lib/libvideobokeh.so
-vendor/lib/libts_detected_face_hal.so
-vendor/lib/libts_face_beautify_hal.so
vendor/lib/libzaf_algs.so
vendor/lib/libzaf_core.so
vendor/lib64/libvideobokeh.so
-vendor/lib64/libts_detected_face_hal.so
-vendor/lib64/libts_face_beautify_hal.so
vendor/etc/camera/camera_config.xml
vendor/etc/camera/mot_ov5675_chromatix.xml
-vendor/etc/camera/mot_s5k3p8sp_chromatix.xml
vendor/etc/camera/mot_s5k4h7_chromatix.xml
vendor/etc/camera/s5k2l7sa_chromatix.xml
vendor/lib64/libcdsprpc.so
@@ -142,25 +130,16 @@ vendor/lib/libchromatix_mot_ov5695_snapshot.so
vendor/lib/libchromatix_mot_ov8856_common.so
vendor/lib/libchromatix_mot_ov8856_cpp_ds_chromatix.so
vendor/lib/libchromatix_mot_ov8856_cpp_hfr_120.so
-vendor/lib/libchromatix_mot_ov8856_cpp_hfr_60.so
-vendor/lib/libchromatix_mot_ov8856_cpp_hfr_90.so
vendor/lib/libchromatix_mot_ov8856_cpp_liveshot.so
vendor/lib/libchromatix_mot_ov8856_cpp_preview.so
+vendor/lib/libchromatix_mot_ov8856_cpp_snapshot_custom.so
vendor/lib/libchromatix_mot_ov8856_cpp_snapshot.so
vendor/lib/libchromatix_mot_ov8856_cpp_us_chromatix.so
vendor/lib/libchromatix_mot_ov8856_cpp_video.so
-vendor/lib/libchromatix_mot_ov8856_default_preview_3a.so
-vendor/lib/libchromatix_mot_ov8856_default_video_3a.so
vendor/lib/libchromatix_mot_ov8856_default_video.so
vendor/lib/libchromatix_mot_ov8856_hfr_120_3a.so
vendor/lib/libchromatix_mot_ov8856_hfr_120.so
-vendor/lib/libchromatix_mot_ov8856_hfr_60_3a.so
-vendor/lib/libchromatix_mot_ov8856_hfr_60.so
-vendor/lib/libchromatix_mot_ov8856_hfr_90_3a.so
-vendor/lib/libchromatix_mot_ov8856_hfr_90.so
-vendor/lib/libchromatix_mot_ov8856_liveshot.so
vendor/lib/libchromatix_mot_ov8856_postproc.so
-vendor/lib/libchromatix_mot_ov8856_preview.so
vendor/lib/libchromatix_mot_ov8856_snapshot.so
vendor/lib/libchromatix_mot_ov8856_zsl_preview_3a.so
vendor/lib/libchromatix_mot_ov8856_zsl_video_3a.so
@@ -274,7 +253,6 @@ vendor/lib/libmmcamera2_stats_modules.so
vendor/lib/libmmcamera_chromaflash_lib.so
vendor/lib/libmmcamera_dbg.so
vendor/lib/libmmcamera_depth_map.so
-vendor/lib/libmmcamera_dummyalgo.so
vendor/lib/libmmcamera_eebinparse.so
vendor/lib/libmmcamera_eeprom_util.so
vendor/lib/libmmcamera_eztune_module.so
@@ -340,6 +318,7 @@ vendor/lib/libmmcamera_mot_ov5675_eeprom.so
vendor/lib/libmmcamera_mot_ov5675.so
vendor/lib/libmmcamera_mot_ov5695_eeprom.so
vendor/lib/libmmcamera_mot_ov5695.so
+vendor/lib/libmmcamera_mot_ov8856_eeprom.so
vendor/lib/libmmcamera_mot_ov8856.so
vendor/lib/libmmcamera_mot_s5k2l7sa_eeprom.so
vendor/lib/libmmcamera_mot_s5k2l7sa_pdaf.so
@@ -347,6 +326,7 @@ vendor/lib/libmmcamera_mot_s5k2l7sa.so
vendor/lib/libmmcamera_mot_s5k2l7.so
vendor/lib/libmmcamera_mot_s5k3p8sp_eeprom.so
vendor/lib/libmmcamera_mot_s5k3p8sp.so
+vendor/lib/libmmcamera_mot_s5k4h7_eeprom.so
vendor/lib/libmmcamera_mot_s5k4h7.so
vendor/lib/libmmcamera_optizoom_lib.so
vendor/lib/libmmcamera_paaf_lib.so
@@ -380,66 +360,12 @@ vendor/lib64/libmmcamera_tintless_algo.so
vendor/lib64/libmmcamera_tintless_bg_pca_algo.so
# Camera - Postprocessing
-vendor/lib/libtrueportrait.so
-vendor/lib64/libtrueportrait.so
-lib/libblurbuster.so:vendor/lib/libblurbuster.so
-lib64/libblurbuster.so:vendor/lib64/libblurbuster.so
-lib64/libclearsight.so:vendor/lib64/libclearsight.so
-lib/libhazebuster.so:vendor/lib/libhazebuster.so
-lib64/libhazebuster.so:vendor/lib64/libhazebuster.so
-vendor/lib/libchromaflash.so
vendor/lib/libdualcameraddm.so
-lib/libjni_blurbuster.so:vendor/lib/libjni_blurbuster.so
-lib/libjni_chromaflash.so:vendor/lib/libjni_chromaflash.so
-lib/libjni_dualcamera.so:vendor/lib/libjni_dualcamera.so
-lib/libjni_filtergenerator.so:vendor/lib/libjni_filtergenerator.so
-lib/libjni_hazebuster.so:vendor/lib/libjni_hazebuster.so
-lib/libjni_makeupV2.so:vendor/lib/libjni_makeupV2.so
-lib/libjni_optizoom.so:vendor/lib/libjni_optizoom.so
-lib/libjni_panorama.so:vendor/lib/libjni_panorama.so
-lib/libjni_seestraight.so:vendor/lib/libjni_seestraight.so
-lib/libjni_sharpshooter.so:vendor/lib/libjni_sharpshooter.so
-lib/libjni_stillmore.so:vendor/lib/libjni_stillmore.so
-lib/libjni_trackingfocus.so:vendor/lib/libjni_trackingfocus.so
-lib/libjni_trueportrait.so:vendor/lib/libjni_trueportrait.so
-lib/libjni_truescanner_v2.so:vendor/lib/libjni_truescanner_v2.so
-lib/libjni_ubifocus.so:vendor/lib/libjni_ubifocus.so
-lib64/libjni_blurbuster.so:vendor/lib64/libjni_blurbuster.so
-lib64/libjni_chromaflash.so:vendor/lib64/libjni_chromaflash.so
-lib64/libjni_clearsight.so:vendor/lib64/libjni_clearsight.so
-lib64/libjni_dualcamera.so:vendor/lib64/libjni_dualcamera.so
-lib64/libjni_filtergenerator.so:vendor/lib64/libjni_filtergenerator.so
-lib64/libjni_hazebuster.so:vendor/lib64/libjni_hazebuster.so
-lib64/libjni_makeupV2.so:vendor/lib64/libjni_makeupV2.so
-lib64/libjni_pacprocessor.so:vendor/lib64/libjni_pacprocessor.so
-lib64/libjni_optizoom.so:vendor/lib64/libjni_optizoom.so
-lib64/libjni_panorama.so:vendor/lib64/libjni_panorama.so
-lib64/libjni_seestraight.so:vendor/lib64/libjni_seestraight.so
-lib64/libjni_sharpshooter.so:vendor/lib64/libjni_sharpshooter.so
-lib64/libjni_stillmore.so:vendor/lib64/libjni_stillmore.so
-lib64/libjni_trackingfocus.so:vendor/lib64/libjni_trackingfocus.so
-lib64/libjni_trueportrait.so:vendor/lib64/libjni_trueportrait.so
-lib64/libjni_truescanner_v2.so:vendor/lib64/libjni_truescanner_v2.so
-lib64/libjni_ubifocus.so:vendor/lib64/libjni_ubifocus.so
-vendor/lib/liboptizoom.so
-vendor/lib/libseemore.so
-lib/libseestraight.so:vendor/lib/libseestraight.so
-lib/libtruescanner.so:vendor/lib/libtruescanner.so
-vendor/lib/libubifocus.so
-vendor/lib64/libchromaflash.so
vendor/lib64/libdualcameraddm.so
-vendor/lib64/liboptizoom.so
-vendor/lib64/libseemore.so
-vendor/lib64/libubifocus.so
vendor/lib/libS5k2l7Pdaf.so
vendor/lib/libS5k2l7PdafCamif.so
vendor/lib/libmm-qcamera.so
-lib/libcamera_metadata.so:vendor/lib/libcamera_metadata.so
-
-# Cam from P
-vendor/lib/libmot_gpu_mapper.so|a7477c7604bf9ac8b7b2ead6283eb6ddb80051fa
-vendor/lib/libgui_vendor.so|2289516454cceae50bb3963f9255bc113a24b508
-vendor/lib/libPui.so|2289516454cceae50bb3963f9255bc113a24b508
+vendor/lib/libmot_gpu_mapper.so
# Camera - Firmware
vendor/firmware/cpp_firmware_v1_10_0.fw
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 4f68111..254d9dc 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -4,33 +4,33 @@
# Audio
PRODUCT_PROPERTY_OVERRIDES += \
- persist.audio.calfile0=/vendor/etc/acdbdata/common/Bluetooth_cal.acdb \
- persist.audio.calfile1=/vendor/etc/acdbdata/common/General_cal.acdb \
- persist.audio.calfile2=/vendor/etc/acdbdata/common/Global_cal.acdb \
- persist.audio.calfile3=/vendor/etc/acdbdata/common/Handset_cal.acdb \
- persist.audio.calfile4=/vendor/etc/acdbdata/common/Hdmi_cal.acdb \
- persist.audio.calfile5=/vendor/etc/acdbdata/common/Headset_cal.acdb \
- persist.audio.calfile6=/vendor/etc/acdbdata/common/Speaker_cal.acdb
+ persist.audio.calfile0=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
+ persist.audio.calfile1=/vendor/etc/acdbdata/General_cal.acdb \
+ persist.audio.calfile2=/vendor/etc/acdbdata/Global_cal.acdb \
+ persist.audio.calfile3=/vendor/etc/acdbdata/Handset_cal.acdb \
+ persist.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb \
+ persist.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb \
+ persist.audio.calfile6=/vendor/etc/acdbdata/Speaker_cal.acdb
-# Camera
+# Mods
PRODUCT_PROPERTY_OVERRIDES += \
- persist.camera.preview.ubwc=0 \
- video.disable.ubwc=1
+ sys.mod.platformsdkversion=205
# Sensors
PRODUCT_PROPERTY_OVERRIDES += \
- ro.hardware.sensors=evert \
- ro.vendor.sensors.maghalcal=true \
- ro.vendor.sensors.amd=false \
+ ro.hardware.sensors=beckham \
+ ro.vendor.sensors.maghalcal=false \
ro.vendor.sensors.pmd=false \
+ ro.vendor.sensors.amd=false \
ro.vendor.sensors.rmd=false \
- ro.vendor.sensors.facing=false \
ro.vendor.sensors.scrn_ortn=false \
ro.vendor.sensors.pedometer=false \
+ ro.vendor.sensors.mot_ltv=true \
+ ro.vendor.sensors.facing=false \
+ ro.vendor.sensors.cmc=false \
ro.vendor.sensors.dev_ori=true \
ro.vendor.sensors.sta_detect=true \
ro.vendor.sensors.mot_detect=true \
- ro.vendor.sensors.cmc=false \
ro.vendor.sdk.sensors.gestures=false
# Display
--
GitLab