FP4: Use libcamera_metadata_shim for unlocking camera
Change-Id: I985c6e317b36d8cdc6b41a9f9f625b293a8987eb
diff --git a/device.mk b/device.mk
index 8d0c2dd..eac412a 100644
--- a/device.mk
+++ b/device.mk
@@ -182,6 +182,7 @@
PRODUCT_PACKAGES += \
android.hardware.camera.provider@2.4-impl \
android.hardware.camera.provider@2.4-service_64 \
+ libcamera_metadata_shim \
vendor.qti.hardware.camera.device@1.0.vendor \
vendor.qti.hardware.camera.postproc@1.0.vendor
diff --git a/extract-files.sh b/extract-files.sh
index c518845..8e2d18e 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -55,8 +55,8 @@
function blob_fixup() {
case "${1}" in
- vendor/lib64/hw/com.qti.chi.override.bitra.so)
- "${SIGSCAN}" -p "31 D2 02 94" -P "1F 20 03 D5" -f "${2}"
+ vendor/lib64/hw/camera.qcom.so)
+ grep -q libcamera_metadata_shim.so "${2}" || "${PATCHELF}" --add-needed libcamera_metadata_shim.so "${2}"
;;
vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.bitra.so)
"${SIGSCAN}" -p "13 0a 00 94" -P "1F 20 03 D5" -f "${2}"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3c5a487..a466d63 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -103,7 +103,7 @@
vendor/lib64/camera/com.qti.tuned.tsp_imx582.bin
vendor/lib64/camera/com.qti.tuned.tsp_imx582_sma.bin
vendor/lib64/hw/camera.qcom.so
-vendor/lib64/hw/com.qti.chi.override.bitra.so|9187f8ff3db2ea982d2a26982df74a4eedb9d308|4f55fc196795885bbaf82e2168104974c051b2ed
+vendor/lib64/hw/com.qti.chi.override.bitra.so
vendor/lib64/hw/com.qti.chi.override.so
vendor/lib64/com.qti.feature2.anchorsync.bitra.so
vendor/lib64/com.qti.feature2.demux.bitra.so