diff --git a/Android.bp b/Android.bp
index 3dc8cf0..7fdd607 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,86 +1,164 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/xiaomi/miuicamera-cupid/setup-makefiles.sh
 
 soong_namespace {
-	imports: [
-                "device/xiaomi/miuicamera-cupid",
-	],
+    imports: [
+        "device/xiaomi/miuicamera-cupid",
+    ],
 }
 
 cc_prebuilt_library_shared {
-	name: "libcamera_algoup_jni.xiaomi",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so"],
-			shared_libs: ["libgui_shim_miuicamera", "libandroid", "libandroid_runtime", "libbase", "libbinder", "libcamera_client", "libcamera_metadata", "libcutils", "libgui", "liblog", "libmedia_jni_utils", "libnativehelper", "libnativewindow", "libui", "libutils", "libvndksupport", "android.hidl.token@1.0-utils", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
+    name: "libcamera_algoup_jni.xiaomi",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so",
+            ],
+            shared_libs: [
+                "libgui_shim_miuicamera",
+                "libandroid",
+                "libandroid_runtime",
+                "libbase",
+                "libbinder",
+                "libcamera_client",
+                "libcamera_metadata",
+                "libcutils",
+                "libgui",
+                "liblog",
+                "libmedia_jni_utils",
+                "libnativehelper",
+                "libnativewindow",
+                "libui",
+                "libutils",
+                "libvndksupport",
+                "android.hidl.token@1.0-utils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "libcamera_mianode_jni.xiaomi",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so"],
-			shared_libs: ["libgui_shim_miuicamera", "libandroid", "libbinder", "libcamera_client", "libcamera_metadata", "libcutils", "libgui", "liblog", "libmedia_jni_utils", "libui", "libutils", "libvndksupport", "libxml2", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
+    name: "libcamera_mianode_jni.xiaomi",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so",
+            ],
+            shared_libs: [
+                "libgui_shim_miuicamera",
+                "libandroid",
+                "libbinder",
+                "libcamera_client",
+                "libcamera_metadata",
+                "libcutils",
+                "libgui",
+                "liblog",
+                "libmedia_jni_utils",
+                "libui",
+                "libutils",
+                "libvndksupport",
+                "libxml2",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "libmicampostproc_client",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system/lib64/libmicampostproc_client.so"],
-			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libnativewindow", "libEGL", "libGLESv2", "libfmq", "libgui", "libui", "libcamera_client", "libcamera_metadata", "libmedia_jni_utils", "libnativehelper", "libhidlbase", "vendor.xiaomi.hardware.campostproc@1.0-system", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
+    name: "libmicampostproc_client",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/libmicampostproc_client.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libhardware",
+                "libnativewindow",
+                "libEGL",
+                "libGLESv2",
+                "libfmq",
+                "libgui",
+                "libui",
+                "libcamera_client",
+                "libcamera_metadata",
+                "libmedia_jni_utils",
+                "libnativehelper",
+                "libhidlbase",
+                "vendor.xiaomi.hardware.campostproc@1.0_system",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.xiaomi.hardware.campostproc@1.0-system",
-	stem: "vendor.xiaomi.hardware.campostproc@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so"],
-			shared_libs: ["android.hardware.camera.common@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
+    name: "vendor.xiaomi.hardware.campostproc@1.0_system",
+    stem: "vendor.xiaomi.hardware.campostproc@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so",
+            ],
+            shared_libs: [
+                "android.hardware.camera.common@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
 }
 
 android_app_import {
-	name: "MiuiCamera",
-	owner: "xiaomi",
-	apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
+    name: "MiuiCamera",
+    owner: "xiaomi",
+    apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
 }
-
diff --git a/Android.mk b/Android.mk
index 2e414c3..362133d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,5 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/miuicamera-cupid/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),miuicamera-cupid)
-
-endif
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index e21247c..18ed0ae 100644
--- a/BoardConfigVendor.mk
+++ b/BoardConfigVendor.mk
@@ -1,4 +1,3 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/miuicamera-cupid/setup-makefiles.sh
-
diff --git a/miuicamera-cupid-vendor.mk b/miuicamera-cupid-vendor.mk
index 6e63945..81d10f3 100644
--- a/miuicamera-cupid-vendor.mk
+++ b/miuicamera-cupid-vendor.mk
@@ -1,14 +1,13 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/miuicamera-cupid/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/miuicamera-cupid
 
-
 PRODUCT_PACKAGES += \
     libcamera_algoup_jni.xiaomi \
     libcamera_mianode_jni.xiaomi \
     libmicampostproc_client \
-    vendor.xiaomi.hardware.campostproc@1.0-system \
+    vendor.xiaomi.hardware.campostproc@1.0_system \
     MiuiCamera
diff --git a/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so b/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so
index 2cbd03c..8ec738b 100644
Binary files a/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so and b/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so differ
diff --git a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so
index b51b6cf..8461041 100644
Binary files a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so and b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk
index 0b5b168..acfa497 100644
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk differ