Patch libs for Android 14

common/Android.bp

@@ -9,7 +9,7 @@ android_app_import {
 	name: "MiuiCamera",
 	owner: "xiaomi",
 	apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
-	overrides: ["GrapheneCamera", "Camera", "Camera2", "Aperture"],
+	overrides: ["GrapheneCamera", "Camera", "Camera2", "Flash", "Aperture"],
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,

common/common-vendor.mk

@@ -8,7 +8,6 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_algoup_jni.xiaomi.so \
     vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_mianode_jni.xiaomi.so \
-    vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/libgui-xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libgui-xiaomi.so \
     vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/libmicampostproc_client.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmicampostproc_client.so \
     vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.xiaomi.hardware.campostproc@1.0.so \
     vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/libOpenCL.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libOpenCL.so \

extract-files.sh

@@ -56,10 +56,7 @@ fi
 function blob_fixup() {
     case "${1}" in
         system/lib64/libcamera_algoup_jni.xiaomi.so|system/lib64/libcamera_mianode_jni.xiaomi.so)
-            patchelf --replace-needed libgui.so libgui-xiaomi.so "${2}"
+            patchelf --add-needed libgui_shim_leicamera.so "${2}"
-            ;;
-        system/lib64/libgui-xiaomi.so)
-            patchelf --set-soname libgui-xiaomi.so "${2}"
             ;;
         system/lib64/libmicampostproc_client.so)
             patchelf --remove-needed libhidltransport.so "${2}"

products/board.mk

@@ -21,5 +21,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += vendor/xiaomi/haydn-miuicamera/sepolicy/vendor
 BUILD_BROKEN_DUP_RULES := true
 
 TARGET_CAMERA_USES_NEWER_HIDL_OVERRIDE_FORMAT := true
+TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
 
 include vendor/xiaomi/haydn-miuicamera/common/BoardConfigVendor.mk

products/miuicamera.mk

@@ -34,12 +34,15 @@ PRODUCT_SYSTEM_PROPERTIES += \
     persist.log.tag.CAM_BoostFrameworkImpl=S \
     ro.product.mod_device=haydn_in_global \
     persist.vendor.camera.privapp.list=com.android.camera \
-    ro.com.google.lens.oem_camera_package=com.android.camera \
+    ro.com.google.lens.oem_camera_package=com.android.camera
-    vendor.camera.aux.packagelist=com.android.camera,org.pixelexperience.faceunlock
 
 # Overlay
 PRODUCT_PACKAGES += \
     MiuiCameraOverlayLos \
     MiuiCameraOverlayAosp
 
+# Shim
+PRODUCT_PACKAGES += \
+    libgui_shim_leicamera
+
 $(call inherit-product, vendor/xiaomi/haydn-miuicamera/common/common-vendor.mk)

proprietary-files.txt

@@ -1,11 +1,10 @@
 # All unpinned blobs below are extracted from miui_HAYDNGlobal_V14.0.3.0.TKKMIXM
 
-product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=GrapheneCamera,Camera,Camera2,Aperture|1eb82ca99df9a4442133cdc6573491b8ca092740
+product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=GrapheneCamera,Camera,Camera2,Flash,Aperture|1eb82ca99df9a4442133cdc6573491b8ca092740
 system/priv-app/MiuiGallery/MiuiGallery.apk;OVERRIDES=Gallery2,Photos
 system/priv-app/MiuiVideoPlayer/MiuiVideoPlayer.apk
 system/lib64/libcamera_algoup_jni.xiaomi.so
 system/lib64/libcamera_mianode_jni.xiaomi.so
-system/lib64/libgui.so:system/lib64/libgui-xiaomi.so
 system/lib64/libmicampostproc_client.so
 system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
 vendor/lib64/libSNPE.so:system/lib64/libSNPE.so

sepolicy/vendor/hal_camera_default.te

@@ -1,7 +1,6 @@
 binder_call(hal_camera_default, platform_app)
 
 allow hal_camera_default mnt_vendor_file:dir { search };
-allow hal_camera_default proc_stat:file { open read };
 allow hal_camera_default vendor_xdsp_device:chr_file { read };
 
 # Allow Camera to access system_server

shims/Android.bp

@@ -0,0 +1,11 @@
+//
+// Copyright (C) 2017-2022 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library_shared {
+    name: "libgui_shim_leicamera",
+    srcs: ["libgui_shim_leicamera.c"],
+    compile_multilib: "64",
+}

shims/libgui_shim_leicamera.c

@@ -0,0 +1,9 @@
+/*
+ * Copyright (C) 2023 The LineageOS Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+void _ZN7android18BnProducerListener16onBufferDetachedEi() {
+    return;
+}