diff --git a/Android.bp b/Android.bp
index e8aa91a..476ae1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,227 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/xiaomi/wayne/setup-makefiles.sh
 
 soong_namespace {
+    imports: [
+        "hardware/xiaomi",
+        "vendor/xiaomi/sdm660-common",
+    ],
 }
 
+cc_prebuilt_library_shared {
+    name: "fingerprint.fpc.default",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/fingerprint.fpc.default.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libhidlbase",
+                "libhidltransport",
+                "android.hardware.biometrics.fingerprint@2.1",
+                "com.fingerprints.extension@1.0",
+                "libQSEEComAPI",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "fingerprint.goodix.default",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/fingerprint.goodix.default.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libc",
+                "libc++",
+                "libbase",
+                "libdl",
+                "libhardware",
+                "libcrypto",
+                "libgf_hal",
+                "libgf_ca",
+                "libvendor.goodix.hardware.fingerprint@1.0",
+                "libvendor.goodix.hardware.fingerprint@1.0-service",
+                "libm",
+                "liblog",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "fingerprint.sdm660",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/hw/fingerprint.sdm660.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "hw",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libgf_ca",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libgf_ca.so",
+            ],
+            shared_libs: [
+                "libQSEEComAPI",
+                "libhardware",
+                "libc",
+                "libm",
+                "libdl",
+                "liblog",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libgf_hal",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libgf_hal.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libutils",
+                "libgf_ca",
+                "libc",
+                "libm",
+                "libdl",
+                "liblog",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libvendor.goodix.hardware.fingerprint@1.0-service",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblzma",
+                "libc",
+                "libc++",
+                "libbase",
+                "libdl",
+                "libhardware",
+                "libprotobuf-cpp-lite-vendorcompat",
+                "libcrypto",
+                "liblog",
+                "libhidlbase",
+                "libhidltransport",
+                "libhwbinder",
+                "android.hidl.base@1.0",
+                "android.hardware.keymaster@3.0",
+                "libvendor.goodix.hardware.fingerprint@1.0",
+                "libgf_hal",
+                "libgf_ca",
+                "libQSEEComAPI",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libvendor.goodix.hardware.fingerprint@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase-v32",
+                "libhidltransport",
+                "libhwbinder",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
diff --git a/Android.mk b/Android.mk
index 6e25fc6..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/wayne/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),wayne)
-
-endif
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index fcbe29f..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/wayne/setup-makefiles.sh
-
diff --git a/proprietary/vendor/lib64/com.fingerprints.extension@1.0.so b/proprietary/vendor/lib64/com.fingerprints.extension@1.0.so
deleted file mode 100644
index 815f1ab..0000000
Binary files a/proprietary/vendor/lib64/com.fingerprints.extension@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so b/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so
index e60f14c..47f09ed 100644
Binary files a/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so and b/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so differ
diff --git a/proprietary/vendor/lib64/hw/fingerprint.sdm660.so b/proprietary/vendor/lib64/hw/fingerprint.sdm660.so
index 6067213..5ac30f0 100644
Binary files a/proprietary/vendor/lib64/hw/fingerprint.sdm660.so and b/proprietary/vendor/lib64/hw/fingerprint.sdm660.so differ
diff --git a/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so b/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so
index 1139fcf..1c47aac 100644
Binary files a/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so and b/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so differ
diff --git a/wayne-vendor.mk b/wayne-vendor.mk
index 1346f3b..240ce9c 100644
--- a/wayne-vendor.mk
+++ b/wayne-vendor.mk
@@ -1,17 +1,18 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/wayne/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/wayne
 
 PRODUCT_COPY_FILES += \
-    vendor/xiaomi/wayne/proprietary/vendor/etc/MIUI_DualCamera_watermark.png:$(TARGET_COPY_OUT_VENDOR)/etc/MIUI_DualCamera_watermark.png \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/com.fingerprints.extension@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.fingerprints.extension@1.0.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/hw/fingerprint.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.sdm660.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/hw/fingerprint.fpc.default.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.fpc.default.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.goodix.default.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/libgf_ca.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgf_ca.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/libgf_hal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgf_hal.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so \
-    vendor/xiaomi/wayne/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.fingerprint@1.0.so
+    vendor/xiaomi/wayne/proprietary/vendor/etc/MIUI_DualCamera_watermark.png:$(TARGET_COPY_OUT_VENDOR)/etc/MIUI_DualCamera_watermark.png
+
+PRODUCT_PACKAGES += \
+    fingerprint.fpc.default \
+    fingerprint.goodix.default \
+    fingerprint.sdm660 \
+    libgf_ca \
+    libgf_hal \
+    libvendor.goodix.hardware.fingerprint@1.0-service \
+    libvendor.goodix.hardware.fingerprint@1.0