From 6fa8797615555f6b7f52da9545626ac5f71dcc10 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 25 Nov 2022 15:46:37 +0100 Subject: [PATCH] sm8250-common: Use libcamera_metadata_shim for unlocking cameras Change-Id: I985c6e317b36d8cdc6b41a9f9f625b293a8987eb --- common.mk | 1 + extract-files.sh | 3 +-- proprietary-files.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 135f3e9..b211df1 100644 --- a/common.mk +++ b/common.mk @@ -114,6 +114,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl \ android.hardware.camera.provider@2.4-service_64 \ + libcamera_metadata_shim \ vendor.qti.hardware.camera.postproc@1.0.vendor PRODUCT_COPY_FILES += \ diff --git a/extract-files.sh b/extract-files.sh index 270d3f2..5301b5f 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -83,8 +83,7 @@ function blob_fixup() { sed -i "s/^NXP_RF_CONF_BLK_10/#NXP_RF_CONF_BLK_10/" "${2}" ;; vendor/lib64/hw/com.qti.chi.override.so) - "${SIGSCAN}" -p "9B 2B 04 94" -P "1F 20 03 D5" -f "${2}" - "${SIGSCAN}" -p "46 23 04 94" -P "1F 20 03 D5" -f "${2}" + grep -q libcamera_metadata_shim.so "${2}" || "${PATCHELF}" --add-needed libcamera_metadata_shim.so "${2}" sed -i "s/com.oem.autotest/\x00om.oem.autotest/" "${2}" ;; vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so) diff --git a/proprietary-files.txt b/proprietary-files.txt index cb6cfc6..aeef2a1 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -184,7 +184,7 @@ vendor/lib64/camera/CFR_para2_OnePlus_EF017_UW_snapshot.bin vendor/lib64/camera/com.qti.eeprom.truly_cmb433.so vendor/lib64/camera/com.qti.tuned.default.bin vendor/lib64/hw/camera.qcom.so -vendor/lib64/hw/com.qti.chi.override.so|bd4b2dd16eb256c278eafb0e224bb9b6885064dd|b62515b12ce72a7c615ebaccd3630eb555f79520 +vendor/lib64/hw/com.qti.chi.override.so vendor/lib64/com.qti.feature2.anchorsync.so vendor/lib64/com.qti.feature2.demux.so vendor/lib64/com.qti.feature2.frameselect.so