peridot: Update from OS3.0.4.0.WNPMIXM

Change-Id: I8fe1b1ae2ed3dfd2c6ee6b1618a33e4590a2b4c7

Android.bp

@@ -740,6 +740,7 @@ cc_prebuilt_library_shared {
                 "libhardware_legacy",
                 "libultrasound_notify",
                 "libresampler",
+                "libar-gpr",
                 "libmispowerop",
                 "libxlog",
                 "libaudiocloudctrl",
@@ -9121,6 +9122,7 @@ cc_prebuilt_library_shared {
                 "libqcodec2_platform",
                 "qti.video.utils.videobufferlayout",
                 "libmisr",
+                "libstagefright_foundation",
                 "libc++",
                 "libc",
                 "libm",
@@ -9336,9 +9338,9 @@ cc_prebuilt_library_shared {
             shared_libs: [
                 "qcrilInterfaces",
                 "libxiaomi_qcril",
+                "libcutils",
                 "libhidlbase",
                 "libqcrilNrFramework",
-                "libcutils",
                 "liblog",
                 "libutils",
                 "qcrild_libqcrilnrutils",
@@ -14130,6 +14132,10 @@ cc_prebuilt_library_shared {
             shared_libs: [
                 "liblog",
                 "libcutils",
+                "libbinder_ndk",
+                "vendor.xiaomi.hardware.mediaeventgatherservice-V1-ndk",
+                "libbinder",
+                "libutils",
                 "libc++",
                 "libc",
                 "libm",
@@ -19959,6 +19965,61 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.camera.synthetic-V1-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.xiaomi.hardware.camera.synthetic-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libnativewindow",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.camera.synthetic-impl",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.xiaomi.hardware.camera.synthetic-impl.so",
+            ],
+            shared_libs: [
+                "vendor.xiaomi.hardware.camera.synthetic-V1-ndk",
+                "libbase",
+                "libbinder_ndk",
+                "liblog",
+                "libnativewindow",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.xiaomi.hardware.display.mihwcextension-V1-ndk",
     owner: "xiaomi",
@@ -20160,6 +20221,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "xiaomi.system.hypsys.common-V1-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/xiaomi.system.hypsys.common-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 prebuilt_rfsa {
     name: "vendor_lib_rfsa_adsp_chre_qsh_shim_so",
     filename: "chre_qsh_shim.so",
@@ -20281,7 +20367,7 @@ cc_prebuilt_library_shared {
                 "vendor.qti.imsrtpservice@3.1",
                 "libbinder",
                 "libbinder_ndk",
-                "vendor.qti.ImsRtpService-V1-ndk",
+                "vendor.qti.ImsRtpService-V2-ndk",
                 "libdiag_system",
                 "libcutils",
                 "libutils",
@@ -20717,19 +20803,9 @@ cc_prebuilt_library_shared {
                 "proprietary/system_ext/lib64/libqesdk_ndk_platform.qti.so",
             ],
             shared_libs: [
-                "libhidlbase",
-                "libutils",
-                "vendor.qti.qesdhal@1.0",
-                "vendor.qti.qesdhal@1.1",
-                "vendor.qti.qesdhal@1.2",
-                "vendor.qti.qesdhalaidl-V2-ndk",
                 "libbinder_ndk",
                 "liblog",
-                "libcutils",
-                "libcrypto",
-                "libjsoncpp",
                 "libnativehelper",
-                "libc++",
                 "libc",
                 "libm",
                 "libdl",
@@ -21371,6 +21447,32 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.qti.ImsRtpService-V2-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.qti.ImsRtpService-V2-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "android.hardware.common-V2-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.qti.diaghal@1.0",
     owner: "xiaomi",
@@ -21810,6 +21912,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -21859,6 +21962,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -21908,6 +22012,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -21957,6 +22062,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22006,6 +22112,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22055,6 +22162,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22104,6 +22212,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22153,6 +22262,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22202,6 +22312,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22251,6 +22362,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22300,6 +22412,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22349,6 +22462,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22398,6 +22512,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22447,6 +22562,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22501,6 +22617,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22563,6 +22680,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22687,6 +22805,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22843,6 +22962,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22938,6 +23058,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -22992,6 +23113,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23005,7 +23127,7 @@ cc_prebuilt_library_shared {
                 "libchilog",
                 "libcom.xiaomi.mawutilsold",
                 "libui",
-                "libMiVideoFilter",
+                "libMiPhotoFilter",
                 "libc",
                 "libm",
                 "libdl",
@@ -23046,6 +23168,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23216,6 +23339,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23267,6 +23391,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23318,6 +23443,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23400,6 +23526,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23484,6 +23611,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23535,6 +23663,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23595,6 +23724,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23741,6 +23871,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23801,6 +23932,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -23861,6 +23993,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -24012,6 +24145,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -24105,6 +24239,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -24340,6 +24475,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -24670,6 +24806,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -26120,6 +26257,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -26169,6 +26307,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -26218,6 +26357,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27289,6 +27429,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27348,6 +27489,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27399,6 +27541,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27450,6 +27593,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27511,6 +27655,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27562,6 +27707,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27614,6 +27760,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27665,6 +27812,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27716,6 +27864,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27785,6 +27934,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27836,6 +27986,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27887,6 +28038,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27938,6 +28090,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -27989,6 +28142,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28040,6 +28194,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28091,6 +28246,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28142,6 +28298,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28196,6 +28353,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28247,6 +28405,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28298,6 +28457,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28349,6 +28509,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28400,6 +28561,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28452,6 +28614,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28503,6 +28666,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28554,6 +28718,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28605,6 +28770,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28690,6 +28856,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28808,6 +28975,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28859,6 +29027,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28910,6 +29079,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -28962,6 +29132,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29013,6 +29184,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29038,6 +29210,32 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "com.xiaomi.camdfx",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/odm/lib64/com.xiaomi.camdfx.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    device_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "com.xiaomi.camhal.overlap",
     owner: "xiaomi",
@@ -29158,6 +29356,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29207,6 +29406,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29360,6 +29560,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29425,6 +29626,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29515,6 +29717,8 @@ cc_prebuilt_library_shared {
                 "libfastmessage",
                 "libcamlog",
                 "libtinyxml2-v34",
+                "vendor.xiaomi.hardware.camera.synthetic-V1-ndk",
+                "vendor.xiaomi.hardware.camera.synthetic-impl",
                 "libc++",
                 "libc",
                 "libm",
@@ -29556,6 +29760,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29610,6 +29815,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -29995,6 +30201,35 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libMiPhotoFilter",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/odm/lib64/libMiPhotoFilter.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libGLESv3",
+                "libEGL",
+                "libnativewindow",
+                "libz",
+                "libm",
+                "libc++_shared",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    device_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libMiStereoFactoryCalibAnalyzeBin_qual",
     owner: "xiaomi",
@@ -30022,34 +30257,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libMiVideoFilter",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libMiVideoFilter.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libGLESv3",
-                "libEGL",
-                "libnativewindow",
-                "libz",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libPlatformValidatorShared",
     owner: "xiaomi",
@@ -31728,6 +31935,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -31802,6 +32010,7 @@ cc_prebuilt_library_shared {
                 "libutilscallstack",
                 "libqti_vndfwk_detect",
                 "libprocessgroup",
+                "com.xiaomi.camdfx",
                 "libz",
                 "libc",
                 "libm",
@@ -31995,6 +32204,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -32301,6 +32511,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -32660,6 +32871,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -32803,6 +33015,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -33089,6 +33302,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -35288,6 +35502,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -36541,6 +36756,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -36649,6 +36865,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcamlog",
                 "libcameraopt",
+                "com.xiaomi.camdfx",
                 "android.hardware.graphics.allocator@4.0",
                 "android.hardware.graphics.mapper@4.0",
                 "libgralloc.qti",
@@ -36787,6 +37004,31 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.mediaeventgatherservice-V1-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/odm/lib64/vendor.xiaomi.hardware.mediaeventgatherservice-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    device_specific: true,
+}
+
 prebuilt_rfsa {
     name: "odm_lib_rfsa_adsp_capi_elus_rx_so",
     filename: "capi_elus_rx.so",
@@ -37123,9 +37365,9 @@ android_app_import {
 }
 
 android_app_import {
-    name: "ImsRcsService",
+    name: "FrameworksUtilsSysService",
     owner: "xiaomi",
-    apk: "proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk",
+    apk: "proprietary/system_ext/app/FrameworksUtilsSysService/FrameworksUtilsSysService.apk",
     certificate: "platform",
     dex_preopt: {
         enabled: false,
@@ -37144,17 +37386,6 @@ android_app_import {
     system_ext_specific: true,
 }
 
-android_app_import {
-    name: "QesdkSysService",
-    owner: "xiaomi",
-    apk: "proprietary/system_ext/app/QesdkSysService/QesdkSysService.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    system_ext_specific: true,
-}
-
 android_app_import {
     name: "QtiTelephonyService",
     owner: "xiaomi",
@@ -37877,9 +38108,9 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-    name: "android.hardware.gnss-aidl-service-qti.xml",
+    name: "gnss-peridot.xml",
     owner: "xiaomi",
-    src: "proprietary/odm/etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml",
+    src: "proprietary/odm/etc/vintf/manifest/gnss-peridot.xml",
     filename_from_src: true,
     sub_dir: "vintf/manifest",
     device_specific: true,
@@ -38263,6 +38494,7 @@ cc_prebuilt_binary {
                 "libutils",
                 "libbinder",
                 "libdisplayfeatureservice",
+                "libtflite",
                 "libc++",
                 "libc",
                 "libm",

Android.mk

@@ -6,29 +6,29 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),peridot)
 
-$(call add-radio-file-sha1-checked,radio/abl.img,185e5a6a7c8c2b51e2ee76af2d9c84a01fc29174)
+$(call add-radio-file-sha1-checked,radio/abl.img,70baf08e57d05b045d6d3994af1a8cc9706896d8)
-$(call add-radio-file-sha1-checked,radio/aop.img,767b86256dba9b5c27a2b96b3ebe9a5ba577e981)
+$(call add-radio-file-sha1-checked,radio/aop.img,92c32e1191e4b0a519b281b198ea30b9b2000daa)
-$(call add-radio-file-sha1-checked,radio/aop_config.img,55d3a4289d76216e5e2a83fc0097a8aa1ca4c0de)
+$(call add-radio-file-sha1-checked,radio/aop_config.img,577fdc0c5cddeec28c46db7873967f5742ddeabd)
-$(call add-radio-file-sha1-checked,radio/bluetooth.img,c20290dc3e6825c427c603ff53c8648a95601501)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,1ab224b295e3f0aa4bd214ab5b8cb4d655c6adfe)
-$(call add-radio-file-sha1-checked,radio/countrycode.img,d9b89342558990f4e49af4bdd3e07f80baedb486)
+$(call add-radio-file-sha1-checked,radio/countrycode.img,00413b6c8baa69eb4442de9679b82fd69be2e7fc)
-$(call add-radio-file-sha1-checked,radio/cpucp.img,69dfc6f33cb5e14e8d47c96efc7f96832be4c3f3)
+$(call add-radio-file-sha1-checked,radio/cpucp.img,c64cff88df74672240ecbaa3d0a71bb283051609)
-$(call add-radio-file-sha1-checked,radio/cpucp_dtb.img,e77a3a322e3a192324462ac02b972f0d0e9622f8)
+$(call add-radio-file-sha1-checked,radio/cpucp_dtb.img,02e40fcccf8bc00bf1964e7313f9e94ddf1b7434)
-$(call add-radio-file-sha1-checked,radio/devcfg.img,9dd2b98e201c67b66db1d736adf701fb1f3a5581)
+$(call add-radio-file-sha1-checked,radio/devcfg.img,588331c86ce40d6deabeeff0ca9512dfa20080c3)
-$(call add-radio-file-sha1-checked,radio/dsp.img,bb30c973bcdf3bcfdca994154b87f6e98e79f446)
+$(call add-radio-file-sha1-checked,radio/dsp.img,9d17a57e35e89ba640b7d1be4ab4b5f101f0e855)
-$(call add-radio-file-sha1-checked,radio/featenabler.img,bc1ebd3f8902cbe630a1368edca4a2fd5d0e258f)
+$(call add-radio-file-sha1-checked,radio/featenabler.img,99c413e97c27397bc800326d4a3c7b0834be73b5)
-$(call add-radio-file-sha1-checked,radio/hyp.img,377a228f24381ee367bd772da95012fc84210f33)
+$(call add-radio-file-sha1-checked,radio/hyp.img,96df5b0d0763b352ae6fb77d49d5b4f94dd397aa)
-$(call add-radio-file-sha1-checked,radio/imagefv.img,1927318e09454452ae6b248f5d0229ef7818d17b)
+$(call add-radio-file-sha1-checked,radio/imagefv.img,03ddc37062d29ec0d917007550faef9ac668dbdc)
-$(call add-radio-file-sha1-checked,radio/keymaster.img,4f993595825440a1f9ca64441c0131086f5891ed)
+$(call add-radio-file-sha1-checked,radio/keymaster.img,d9220757bf80bf03cb207d3531a3191a62ce9182)
-$(call add-radio-file-sha1-checked,radio/modem.img,d8a7c6927e35445c952778dcd37376123eaef68f)
+$(call add-radio-file-sha1-checked,radio/modem.img,696920ca418370d603603356e679014723ce3478)
-$(call add-radio-file-sha1-checked,radio/modemfirmware.img,2ab42384fef1804f4f76981c57f3965e3919398d)
+$(call add-radio-file-sha1-checked,radio/modemfirmware.img,6dc7aa99cee9fdfb7df7250f07b2d9292ed9ff7a)
 $(call add-radio-file-sha1-checked,radio/multiimgqti.img,85c6e03d0dd54630f5017c9c83517fbe19ad6af1)
-$(call add-radio-file-sha1-checked,radio/qupfw.img,7dacb4f873241226b0dc668860208bdaccf2847c)
+$(call add-radio-file-sha1-checked,radio/qupfw.img,e8662c62cedeeaa4b2f86e217e17b29cc2f7e37a)
-$(call add-radio-file-sha1-checked,radio/shrm.img,63b9c5f807076fa9cf0812f4a094c581620fe3a2)
+$(call add-radio-file-sha1-checked,radio/shrm.img,8859e4571ca2ee204bf5fdcaad49ad5acd35f59f)
-$(call add-radio-file-sha1-checked,radio/tz.img,e18c1a595ff329d4c844cdfdf7b0d1516d94a4bf)
+$(call add-radio-file-sha1-checked,radio/tz.img,f8406a77d86dcc579073c3f0aed59be616ea9b8a)
-$(call add-radio-file-sha1-checked,radio/uefi.img,a45a75999380175823ccab2d6649a1e87d25c483)
+$(call add-radio-file-sha1-checked,radio/uefi.img,ee62bf8d2c53781c926ffa428a0ffbbf8fcbe9f4)
-$(call add-radio-file-sha1-checked,radio/uefisecapp.img,55178227067ed66f282579c75329d88a89f52de0)
+$(call add-radio-file-sha1-checked,radio/uefisecapp.img,3e1857588f6b999da7c8795c25a3854ea2b05af2)
-$(call add-radio-file-sha1-checked,radio/xbl.img,d4dcb04ea48860819febc6ae40a316c50900a969)
+$(call add-radio-file-sha1-checked,radio/xbl.img,d4365875efc191fd114ee2a592e6b778a938e225)
-$(call add-radio-file-sha1-checked,radio/xbl_config.img,d0968e5f1ed27d6547ed6b660337dcb3a25a3735)
+$(call add-radio-file-sha1-checked,radio/xbl_config.img,f24e8c7543455ce306c4990da06606e4528a5e17)
-$(call add-radio-file-sha1-checked,radio/xbl_ramdump.img,1d629ef6a3eca03ffa5bd578bdab335775a04ea4)
+$(call add-radio-file-sha1-checked,radio/xbl_ramdump.img,b2a5eab810feca15633f27974a1aa9fddc8bdd15)
 
 endif

peridot-vendor.mk

@@ -56,7 +56,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/peridot/proprietary/odm/etc/camera/beauty_config_gl.json:$(TARGET_COPY_OUT_ODM)/etc/camera/beauty_config_gl.json \
     vendor/xiaomi/peridot/proprietary/odm/etc/camera/beauty_config_gl_8g.json:$(TARGET_COPY_OUT_ODM)/etc/camera/beauty_config_gl_8g.json \
     vendor/xiaomi/peridot/proprietary/odm/etc/camera/beauty_style_nude.cng:$(TARGET_COPY_OUT_ODM)/etc/camera/beauty_style_nude.cng \
-    vendor/xiaomi/peridot/proprietary/odm/etc/camera/cameraopt.json:$(TARGET_COPY_OUT_ODM)/etc/camera/cameraopt.json \
     vendor/xiaomi/peridot/proprietary/odm/etc/camera/camerascene.json:$(TARGET_COPY_OUT_ODM)/etc/camera/camerascene.json \
     vendor/xiaomi/peridot/proprietary/odm/etc/camera/camxoverridesettings.txt:$(TARGET_COPY_OUT_ODM)/etc/camera/camxoverridesettings.txt \
     vendor/xiaomi/peridot/proprietary/odm/etc/camera/com.xiaomi.dcal.wu.golden:$(TARGET_COPY_OUT_ODM)/etc/camera/com.xiaomi.dcal.wu.golden \
@@ -476,6 +475,17 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/peridot/proprietary/odm/etc/disp0/mdss_dsi_n16t_42_0a_0c_dsc_vid/mi_gc_1.txt:$(TARGET_COPY_OUT_ODM)/etc/disp0/mdss_dsi_n16t_42_0a_0c_dsc_vid/mi_gc_1.txt \
     vendor/xiaomi/peridot/proprietary/odm/etc/disp0/mdss_dsi_n16t_42_0a_0c_dsc_vid/mi_gc_2.txt:$(TARGET_COPY_OUT_ODM)/etc/disp0/mdss_dsi_n16t_42_0a_0c_dsc_vid/mi_gc_2.txt \
     vendor/xiaomi/peridot/proprietary/odm/etc/disp0/mdss_dsi_n16t_42_0a_0c_dsc_vid/mi_gc_3.txt:$(TARGET_COPY_OUT_ODM)/etc/disp0/mdss_dsi_n16t_42_0a_0c_dsc_vid/mi_gc_3.txt \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/3dlut-pt-onnx-ptq-htp-fp16.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/3dlut-pt-onnx-ptq-htp-fp16.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/8635_sr_2x_y1280x720.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/8635_sr_2x_y1280x720.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/8635_sr_2x_y540x960.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/8635_sr_2x_y540x960.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/8635_sr_2x_y720x1280.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/8635_sr_2x_y720x1280.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/8635_sr_2x_y960x540.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/8635_sr_2x_y960x540.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/8635_sr_3x_y368x640.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/8635_sr_3x_y368x640.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/8635_sr_3x_y640x368.dlc:$(TARGET_COPY_OUT_ODM)/etc/display/8635_sr_3x_y640x368.dlc \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/LUT.txt:$(TARGET_COPY_OUT_ODM)/etc/display/LUT.txt \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/LUT0.txt:$(TARGET_COPY_OUT_ODM)/etc/display/LUT0.txt \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/LUT1.txt:$(TARGET_COPY_OUT_ODM)/etc/display/LUT1.txt \
+    vendor/xiaomi/peridot/proprietary/odm/etc/display/LUT2.txt:$(TARGET_COPY_OUT_ODM)/etc/display/LUT2.txt \
     vendor/xiaomi/peridot/proprietary/odm/etc/display/qdcm_calib_data_xiaomi_36_0f_0b_video_mode_dsc_dsi_panel.json:$(TARGET_COPY_OUT_ODM)/etc/display/qdcm_calib_data_xiaomi_36_0f_0b_video_mode_dsc_dsi_panel.json \
     vendor/xiaomi/peridot/proprietary/odm/etc/display/qdcm_calib_data_xiaomi_42_02_0a_video_mode_dsc_dsi_panel.json:$(TARGET_COPY_OUT_ODM)/etc/display/qdcm_calib_data_xiaomi_42_02_0a_video_mode_dsc_dsi_panel.json \
     vendor/xiaomi/peridot/proprietary/odm/etc/display/qdcm_calib_data_xiaomi_42_0a_0c_video_mode_dsc_dsi_panel.json:$(TARGET_COPY_OUT_ODM)/etc/display/qdcm_calib_data_xiaomi_42_0a_0c_video_mode_dsc_dsi_panel.json \
@@ -807,6 +817,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/peridot/proprietary/product/etc/permissions/UimService.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimService.xml \
     vendor/xiaomi/peridot/proprietary/product/etc/permissions/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml \
     vendor/xiaomi/peridot/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
+    vendor/xiaomi/peridot/proprietary/system_ext/etc/init/qspa_system.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/qspa_system.rc \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
@@ -816,19 +827,14 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml \
+    vendor/xiaomi/peridot/proprietary/system_ext/etc/qspa/qspa_default.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/qspa/qspa_default.rc \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice64.policy \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_telephony_system_packages_config.xml \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist_system_ext.xml \
     vendor/xiaomi/peridot/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/ffv_models/ffv__5.0.1_0.1__3.0.0_0.0__eai_2.10_enpu3.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/ffv_models/ffv__5.0.1_0.1__3.0.0_0.0__eai_2.10_enpu3.pmd \
     vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__11.0.1.6_1.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.0__eai_3.4_enpuv4.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__11.0.1.6_1.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.0__eai_3.4_enpuv4.pmd \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__2.6.5_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__2.6.5_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__2.7.2_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.4_enpuv4.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__2.7.2_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.4_enpuv4.pmd \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.0_enpuv4.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__2.7.8_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.0_enpuv4.pmd \
     vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__4.8.14_1.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.4_enpuv4.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__4.8.14_1.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.4_enpuv4.pmd \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__4.8.3_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__4.8.3_0.0__3.0.0_0.0__3.1.0_0.0__3.2.0_0.0__eai_2.10_enpuv3.pmd \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_ns_models/fai__4.8.4_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.0_enpuv4.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_ns_models/fai__4.8.4_0.0__3.0.0_0.0__3.1.1_0.0__3.2.0_0.1__eai_3.0_enpuv4.pmd \
     vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_vad_models/fai__3.0.0_0.0__eai_2.10_enpuv3.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_vad_models/fai__3.0.0_0.0__eai_2.10_enpuv3.pmd \
     vendor/xiaomi/peridot/proprietary/vendor/etc/acdbdata/nn_vad_models/fai__3.0.0_0.0__eai_3.4_enpuv4.pmd:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/nn_vad_models/fai__3.0.0_0.0__eai_3.4_enpuv4.pmd \
     vendor/xiaomi/peridot/proprietary/vendor/etc/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \
@@ -876,21 +882,10 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/peridot/proprietary/vendor/etc/data/nicm_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/nicm_config.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/data/tlpd_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/tlpd_oem_config.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/com.qualcomm.qti.cne.xml \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/3dlut-pt-onnx-ptq-htp-fp16.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/3dlut-pt-onnx-ptq-htp-fp16.dlc \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/8635_sr_2x_y1280x720.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/8635_sr_2x_y1280x720.dlc \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/8635_sr_2x_y540x960.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/8635_sr_2x_y540x960.dlc \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/8635_sr_2x_y720x1280.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/8635_sr_2x_y720x1280.dlc \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/8635_sr_2x_y960x540.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/8635_sr_2x_y960x540.dlc \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/8635_sr_3x_y368x640.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/8635_sr_3x_y368x640.dlc \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/8635_sr_3x_y640x368.dlc:$(TARGET_COPY_OUT_VENDOR)/etc/display/8635_sr_3x_y640x368.dlc \
     vendor/xiaomi/peridot/proprietary/vendor/etc/display/DPU1010.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display/DPU1010.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/display/DPU10__.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display/DPU10__.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/display/DPU870.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display/DPU870.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/display/DPU9__.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display/DPU9__.xml \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/LUT.txt:$(TARGET_COPY_OUT_VENDOR)/etc/display/LUT.txt \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/LUT0.txt:$(TARGET_COPY_OUT_VENDOR)/etc/display/LUT0.txt \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/LUT1.txt:$(TARGET_COPY_OUT_VENDOR)/etc/display/LUT1.txt \
-    vendor/xiaomi/peridot/proprietary/vendor/etc/display/LUT2.txt:$(TARGET_COPY_OUT_VENDOR)/etc/display/LUT2.txt \
     vendor/xiaomi/peridot/proprietary/vendor/etc/display/advanced_sf_offsets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display/advanced_sf_offsets.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/display/thermallevel_to_fps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display/thermallevel_to_fps.xml \
     vendor/xiaomi/peridot/proprietary/vendor/etc/dpm_vndr/vendor.dpm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/dpm_vndr/vendor.dpm.conf \
@@ -1735,6 +1730,8 @@ PRODUCT_PACKAGES += \
     vendor.qti.voiceprint@1.0 \
     vendor.xiaomi.hardware.aidl.mtdservice-V1-ndk_platform \
     vendor.xiaomi.hardware.aon-V1-ndk \
+    vendor.xiaomi.hardware.camera.synthetic-V1-ndk \
+    vendor.xiaomi.hardware.camera.synthetic-impl \
     vendor.xiaomi.hardware.display.mihwcextension-V1-ndk \
     vendor.xiaomi.hardware.displayfeature_aidl-V2-ndk \
     vendor.xiaomi.hardware.fx.tunnel-V1-ndk \
@@ -1743,6 +1740,7 @@ PRODUCT_PACKAGES += \
     vendor.xiaomi.hardware.seccam-V1-ndk \
     vendor.xiaomi.sensor.camera-V1-ndk \
     vendor.xiaomi.sensor.citsensorservice-V1-ndk \
+    xiaomi.system.hypsys.common-V1-ndk \
     vendor_lib_rfsa_adsp_chre_qsh_shim_so \
     vendor_lib_rfsa_adsp_libDspIOProxy_skel_so \
     vendor_lib_rfsa_adsp_libSnpeHtpV73Skel_so \
@@ -1784,6 +1782,7 @@ PRODUCT_PACKAGES += \
     libwfduibcsrc \
     libwfduibcsrcinterface \
     vendor.qti.ImsRtpService-V1-ndk \
+    vendor.qti.ImsRtpService-V2-ndk \
     vendor.qti.diaghal@1.0 \
     vendor.qti.hardware.qccsyshal@1.0 \
     vendor.qti.hardware.qccsyshal@1.1 \
@@ -1971,6 +1970,7 @@ PRODUCT_PACKAGES += \
     com.qualcomm.mcx.nonlinearmapper \
     com.qualcomm.mcx.policy.mfl \
     com.qualcomm.qti.mcx.usecase.extension \
+    com.xiaomi.camdfx \
     com.xiaomi.camhal.overlap \
     com.xiaomi.camhal.submodel.camxfrag \
     com.xiaomi.camhal.submodel.chifrag \
@@ -1995,8 +1995,8 @@ PRODUCT_PACKAGES += \
     libITT \
     libMiDispDevManager \
     libMiMotion \
+    libMiPhotoFilter \
     libMiStereoFactoryCalibAnalyzeBin_qual \
-    libMiVideoFilter \
     libPlatformValidatorShared \
     libQnnChrometraceProfilingReader \
     libQnnCpu \
@@ -2217,6 +2217,7 @@ PRODUCT_PACKAGES += \
     vendor.xiaomi.hardware.aidlbgservice-V1-ndk_platform \
     vendor.xiaomi.hardware.bgservice@1.0-impl \
     vendor.xiaomi.hardware.bgservice@1.0 \
+    vendor.xiaomi.hardware.mediaeventgatherservice-V1-ndk \
     odm_lib_rfsa_adsp_capi_elus_rx_so \
     odm_lib_rfsa_adsp_capi_elus_tx_so \
     odm_lib_rfsa_adsp_libCalculator_skel_so \
@@ -2252,9 +2253,8 @@ PRODUCT_PACKAGES += \
     HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
     HotwordEnrollmentYGoogleHEXAGON_WIDEBAND \
     AtFwd2 \
-    ImsRcsService \
+    FrameworksUtilsSysService \
     QCC \
-    QesdkSysService \
     QtiTelephonyService \
     QtiTelephony \
     WfdService \
@@ -2333,7 +2333,7 @@ PRODUCT_PACKAGES += \
     vendor.xiaomi.hardware.displayfeature_aidl-service.xml \
     vendor.xiaomi.hardware.quickcamera.xml \
     vendor.qti.qesdsys.service.xml \
-    android.hardware.gnss-aidl-service-qti.xml \
+    gnss-peridot.xml \
     manifest_vendor.xiaomi.hardware.mlipay.xml \
     vendor.qti.camera.offlinecamera-impl.xml \
     vendor.qti.camera.postproc-impl.xml \

proprietary/odm/etc/camera/beauty_config_cn_8g.json

@@ -252,7 +252,7 @@
         "BeautyMode": 2,
         "Options": [
             {
-                "Id": 02,
+                "Id": 01,
                 "Val": 0
             }
         ]

proprietary/odm/etc/camera/cameraopt.json

@@ -1,11 +0,0 @@
-{
-    "version": "1.0",
-    "CameraBooster": {
-        "support": {
-            "animation_inhibit_support": true
-        },
-        "threshold": {
-            "free_memory_threshold": 1500000
-        }
-    }
-}

proprietary/odm/etc/camera/camxoverridesettings.txt

@@ -275,4 +275,10 @@ LoadTuningDataManagerAsync=TRUE
 enableOISOptimization=TRUE
 
 extraBufferAlloc=9
-SDK_LOG_LEVEL=3
+SDK_LOG_LEVEL=4
+
+WatermarkVersion=3.002
+FilterVersion=3.002
+
+enableInternalKMDRecovery=TRUE
+crcErrorDivisor=100

proprietary/odm/etc/init/android.hardware.gnss-aidl-service-qti.rc

@@ -1,9 +1,9 @@
 # MIUI MOD: GPS_GpsRemove
 # service gnss_service /vendor/bin/hw/android.hardware.gnss-aidl-service-qti
 service gnss_service /vendor/odm/bin/hw/android.hardware.gnss-aidl-service-qti
+#    interface aidl android.hardware.gnss.IGnss/default
+#    interface aidl vendor.qti.gnss.ILocAidlGnss/default
 # END GPS_GpsRemove
-    interface aidl android.hardware.gnss.IGnss/default
-    interface aidl vendor.qti.gnss.ILocAidlGnss/default
     class hal
     user gps
     group system gps radio vendor_qti_diag vendor_ssgtzd

proprietary/odm/etc/vintf/manifest/gnss-peridot.xml

@@ -1,3 +1,4 @@
+<!--MIUI ADD: GPS_SingleBeidou -->
 <!-- Copyright (c) 2021, The Linux Foundation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -63,9 +64,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.gnss</name>
-<!--MIUI ADD: GPS_StabilityEnhance -->
         <version>3</version>
-<!--END GPS_StabilityEnhance      -->
         <fqname>IGnss/default</fqname>
     </hal>
 </manifest>
+<!--END GPS_SingleBeidou      -->