diff --git a/Android.bp b/Android.bp
index f43a686..9c04192 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,6 +7,605 @@ soong_namespace {
 	],
 }
 
+cc_prebuilt_library_shared {
+	name: "libpenguin",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libpenguin.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAPSClient-cmd-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAPSClient-cmd-jni.so"],
+			shared_libs: ["libvndksupport", "liblog", "libandroid", "libnativewindow", "libjnigraphics", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAPSClient-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAPSClient-jni.so"],
+			shared_libs: ["libvndksupport", "liblog", "libandroid", "libnativewindow", "libjnigraphics", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAncFilter_jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAncFilter_jni.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAncHumBokeh-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAncHumBokeh-jni.so"],
+			shared_libs: ["libjnigraphics", "liblog", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAncHumanDoubleExposure-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAncHumanDoubleExposure-jni.so"],
+			shared_libs: ["libjnigraphics", "liblog", "libEGL", "libGLESv3", "libandroid", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAncHumanRetain-jni_v2",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAncHumanRetain-jni_v2.so"],
+			shared_libs: ["libjnigraphics", "liblog", "libEGL", "libGLESv3", "libandroid", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAncHumanSegFigureFusion-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAncHumanSegFigureFusion-jni.so"],
+			shared_libs: ["libjnigraphics", "liblog", "libEGL", "libGLESv3", "libandroid", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAncHumanVideo-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAncHumanVideo-jni.so"],
+			shared_libs: ["libjnigraphics", "liblog", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libApsFaceBeautyPreviewProductJni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libApsFaceBeautyPreviewProductJni.so"],
+			shared_libs: ["libvndksupport", "liblog", "libandroid", "libjnigraphics", "libEGL", "libGLESv1_CM", "libGLESv3", "libz", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAvatarEngineRender",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAvatarEngineRender.so"],
+			shared_libs: ["liblog", "libdl", "libandroid", "libz", "libGLESv3", "libEGL", "libstdc++", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libAvatarEngineRenderNative",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libAvatarEngineRenderNative.so"],
+			shared_libs: ["libAvatarEngineRender", "liblog", "libdl", "libandroid", "libz", "libGLESv3", "libEGL", "libstdc++", "libm", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libCombineLut",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libCombineLut.so"],
+			shared_libs: ["liblog", "libGLESv3", "libEGL", "libdl", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libCombineLutJni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libCombineLutJni.so"],
+			shared_libs: ["libCombineLut", "liblog", "libandroid", "libjnigraphics", "libEGL", "libGLESv1_CM", "libGLESv3", "libz", "libc", "libm", "libstdc++", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libFileExtender-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libFileExtender-jni.so"],
+			shared_libs: ["libextendfile", "liblog", "libandroid", "libEGL", "libGLESv3", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libHeifEncoderWrapper",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libHeifEncoderWrapper.so"],
+			shared_libs: ["liboplusheifwriter", "libutils", "libstagefright", "libstagefright_foundation", "liblog", "libmedia_omx", "libmedia", "libmedia_codeclist", "libnativehelper", "libandroid_runtime", "libnativewindow", "libui", "libgui", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libNativeWinBuffExchange",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libNativeWinBuffExchange.so"],
+			shared_libs: ["liblog", "libutils", "libnativewindow", "libui", "libgui", "android.hardware.graphics.bufferqueue@1.0", "android.hardware.graphics.bufferqueue@2.0", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libOplusBlurPreviewJNI",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libOplusBlurPreviewJNI.so"],
+			shared_libs: ["libvndksupport", "liblog", "libandroid", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libSuperTextWrapper_system_ext",
+	stem: "libSuperTextWrapper",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libSuperTextWrapper.so"],
+			shared_libs: ["liblog", "libXDocProcessSDK_system_ext", "libYTCommon_system_ext", "libGLESv3", "libEGL", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libXDocProcessSDK-jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libXDocProcessSDK-jni.so"],
+			shared_libs: ["liblog", "libjnigraphics", "libvndksupport", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libXDocProcessSDK_system_ext",
+	stem: "libXDocProcessSDK",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libXDocProcessSDK.so"],
+			shared_libs: ["libdl", "liblog", "libYTCommon_system_ext", "libEGL", "libGLESv3", "libc", "libz", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libYTCommon_system_ext",
+	stem: "libYTCommon",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libYTCommon.so"],
+			shared_libs: ["liblog", "libz", "libm", "libstdc++", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libarcsoft_wideselfie",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libarcsoft_wideselfie.so"],
+			shared_libs: ["libmpbase_system_ext", "liblog", "libdl", "libc", "libm", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcolorx-loader",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libcolorx-loader.so"],
+			shared_libs: ["liblog", "libcutils", "libutilscallstack", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcolorx",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libcolorx.so"],
+			shared_libs: ["liblog", "libbinder", "libutils", "libcutils", "libutilscallstack", "libz", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libcoolex",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libcoolex.so"],
+			shared_libs: ["liblog", "libbinder", "libcolorx", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libextendfile",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libextendfile.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libjni_wideselfie",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libjni_wideselfie.so"],
+			shared_libs: ["libjnigraphics", "liblog", "libandroid", "libc", "libm", "libstdc++", "libdl", "libarcsoft_wideselfie", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libjnisingleblur_api",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libjnisingleblur_api.so"],
+			shared_libs: ["libz", "libjnigraphics", "libvndksupport", "liblog", "libGLESv2", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libjnistblur_api",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libjnistblur_api.so"],
+			shared_libs: ["libz", "libjnigraphics", "libvndksupport", "liblog", "libGLESv2", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libmpbase_system_ext",
+	stem: "libmpbase",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libmpbase.so"],
+			shared_libs: ["libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "liboplusheifwriter",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/liboplusheifwriter.so"],
+			shared_libs: ["libutils", "libcutils", "libstagefright", "libstagefright_foundation", "liblog", "libmedia_omx", "libmedia", "libmedia_codeclist", "libnativehelper", "libandroid_runtime", "libnativewindow", "libui", "libgui", "libbase", "libjpeg", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libsingle_camera_bokeh_native",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libsingle_camera_bokeh_native.so"],
+			shared_libs: ["liblog", "libGLESv3", "libEGL", "libnativewindow", "libmpbase_system_ext", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libst_mobile",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libst_mobile.so"],
+			shared_libs: ["libz", "libGLESv2", "libEGL", "liblog", "libm", "libc", "libdl", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libst_sticker_jni",
+	owner: "oplus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libst_sticker_jni.so"],
+			shared_libs: ["liblog", "libst_mobile", "libandroid", "libGLESv3", "libEGL", "libm", "libdl", "libc", ],
+		},
+	},
+	compile_multilib: "64",
+	prefer: true,
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "OplusAppPlatform",
 	owner: "oplus",
diff --git a/camera-vendor.mk b/camera-vendor.mk
index 3495020..d602768 100644
--- a/camera-vendor.mk
+++ b/camera-vendor.mk
@@ -6,61 +6,44 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/oplus/camera
 
 PRODUCT_COPY_FILES += \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAPSClient-cmd-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAPSClient-cmd-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAPSClient-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAPSClient-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAncFilter_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAncFilter_jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAncHumBokeh-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAncHumBokeh-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAncHumanDoubleExposure-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAncHumanDoubleExposure-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAncHumanRetain-jni_v2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAncHumanRetain-jni_v2.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAncHumanSegFigureFusion-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAncHumanSegFigureFusion-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAncHumanVideo-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAncHumanVideo-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libApsFaceBeautyPreviewProductJni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libApsFaceBeautyPreviewProductJni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAvatarEngineRender.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAvatarEngineRender.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libAvatarEngineRenderNative.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libAvatarEngineRenderNative.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libCombineLut.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libCombineLut.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libCombineLutJni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libCombineLutJni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libFileExtender-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libFileExtender-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libOplusBlurPreviewJNI.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libOplusBlurPreviewJNI.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libSuperTextWrapper.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libSuperTextWrapper.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libXDocProcessSDK-jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libXDocProcessSDK-jni.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libXDocProcessSDK.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libXDocProcessSDK.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libYTCommon.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libYTCommon.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libarcsoft_wideselfie.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libarcsoft_wideselfie.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libcolorx-loader.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcolorx-loader.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libcolorx.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcolorx.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libcoolex.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcoolex.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libextendfile.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libextendfile.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libjni_wideselfie.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libjni_wideselfie.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libjnisingleblur_api.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libjnisingleblur_api.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libjnistblur_api.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libjnistblur_api.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libmpbase.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmpbase.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libsingle_camera_bokeh_native.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libsingle_camera_bokeh_native.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libst_mobile.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libst_mobile.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libst_sticker_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libst_sticker_jni.so \
-    vendor/oplus/camera/proprietary/system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml \
-    vendor/oplus/camera/proprietary/odm/lib64/libCaptureBokeh.so:$(TARGET_COPY_OUT_ODM)/lib64/libCaptureBokeh.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamAIBeautyBodyDetection.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamAIBeautyBodyDetection.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamAiBeautyEyeRetouchCn.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamAiBeautyEyeRetouchCn.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamAiBeautyFaceRetouchCn.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamAiBeautyFaceRetouchCn.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamAiUnifySkin.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamAiUnifySkin.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamFaceBeautyCap.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamFaceBeautyCap.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamFaceRestore.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamFaceRestore.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamHybridRaw.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamHybridRaw.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libOPAlgoCamSinglePortrait.so:$(TARGET_COPY_OUT_ODM)/lib64/libOPAlgoCamSinglePortrait.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libXDocProcessSDK.so:$(TARGET_COPY_OUT_ODM)/lib64/libXDocProcessSDK.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_portrait_super_night.so:$(TARGET_COPY_OUT_ODM)/lib64/libarcsoft_turbo_fusion_raw_portrait_super_night.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_super_night.so:$(TARGET_COPY_OUT_ODM)/lib64/libarcsoft_turbo_fusion_raw_super_night.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libarcsoft_turbo_hdr_grf.so:$(TARGET_COPY_OUT_ODM)/lib64/libarcsoft_turbo_hdr_grf.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw.so:$(TARGET_COPY_OUT_ODM)/lib64/libarcsoft_turbo_hdr_raw.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw_front.so:$(TARGET_COPY_OUT_ODM)/lib64/libarcsoft_turbo_hdr_raw_front.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libarcsoft_turbo_raw.so:$(TARGET_COPY_OUT_ODM)/lib64/libarcsoft_turbo_raw.so \
-    vendor/oplus/camera/proprietary/odm/lib64/libtrace.so:$(TARGET_COPY_OUT_ODM)/lib64/libtrace.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libHeifEncoderWrapper.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libHeifEncoderWrapper.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/libNativeWinBuffExchange.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libNativeWinBuffExchange.so \
-    vendor/oplus/camera/proprietary/system_ext/lib64/liboplusheifwriter.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/liboplusheifwriter.so \
-    vendor/oplus/camera/proprietary/vendor/lib64/libpenguin.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpenguin.so
+    vendor/oplus/camera/proprietary/system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml
 
 PRODUCT_PACKAGES += \
+    libpenguin \
+    libAPSClient-cmd-jni \
+    libAPSClient-jni \
+    libAncFilter_jni \
+    libAncHumBokeh-jni \
+    libAncHumanDoubleExposure-jni \
+    libAncHumanRetain-jni_v2 \
+    libAncHumanSegFigureFusion-jni \
+    libAncHumanVideo-jni \
+    libApsFaceBeautyPreviewProductJni \
+    libAvatarEngineRender \
+    libAvatarEngineRenderNative \
+    libCombineLut \
+    libCombineLutJni \
+    libFileExtender-jni \
+    libHeifEncoderWrapper \
+    libNativeWinBuffExchange \
+    libOplusBlurPreviewJNI \
+    libSuperTextWrapper_system_ext \
+    libXDocProcessSDK-jni \
+    libXDocProcessSDK_system_ext \
+    libYTCommon_system_ext \
+    libarcsoft_wideselfie \
+    libcolorx-loader \
+    libcolorx \
+    libcoolex \
+    libextendfile \
+    libjni_wideselfie \
+    libjnisingleblur_api \
+    libjnistblur_api \
+    libmpbase_system_ext \
+    liboplusheifwriter \
+    libsingle_camera_bokeh_native \
+    libst_mobile \
+    libst_sticker_jni \
     OplusAppPlatform \
     OplusCamera \
     oplus-support-wrapper \
diff --git a/extract-files.sh b/extract-files.sh
index 1b563b5..f01f9ee 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 #
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2023 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -32,19 +31,20 @@ SECTION=
 
 while [ "${#}" -gt 0 ]; do
     case "${1}" in
-        -n | --no-cleanup )
-                CLEAN_VENDOR=false
-                ;;
-        -k | --kang )
-                KANG="--kang"
-                ;;
-        -s | --section )
-                SECTION="${2}"; shift
-                CLEAN_VENDOR=false
-                ;;
-        * )
-                SRC="${1}"
-                ;;
+        -n | --no-cleanup)
+            CLEAN_VENDOR=false
+            ;;
+        -k | --kang)
+            KANG="--kang"
+            ;;
+        -s | --section)
+            SECTION="${2}"
+            shift
+            CLEAN_VENDOR=false
+            ;;
+        *)
+            SRC="${1}"
+            ;;
     esac
     shift
 done
diff --git a/proprietary-files.txt b/proprietary-files.txt
index cfc82e1..7cb2bf6 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -2,7 +2,7 @@
 ## are from Oneplus 11 5G (CPH2449_14.0.0.401(EX01)).
 
 # Camera
--my_product/app/OplusCamera/OplusCamera.apk:system_ext/priv-app/OplusCamera/OplusCamera.apk;OVERRIDES=Camera2,GoogleCameraGo
+my_product/app/OplusCamera/OplusCamera.apk:system_ext/priv-app/OplusCamera/OplusCamera.apk;OVERRIDES=Camera2,GoogleCameraGo
 my_product/lib64/libAPSClient-cmd-jni.so:system_ext/lib64/libAPSClient-cmd-jni.so
 my_product/lib64/libAPSClient-jni.so:system_ext/lib64/libAPSClient-jni.so
 my_product/lib64/libAncFilter_jni.so:system_ext/lib64/libAncFilter_jni.so
@@ -11,52 +11,35 @@ my_product/lib64/libAncHumanDoubleExposure-jni.so:system_ext/lib64/libAncHumanDo
 my_product/lib64/libAncHumanRetain-jni_v2.so:system_ext/lib64/libAncHumanRetain-jni_v2.so
 my_product/lib64/libAncHumanSegFigureFusion-jni.so:system_ext/lib64/libAncHumanSegFigureFusion-jni.so
 my_product/lib64/libAncHumanVideo-jni.so:system_ext/lib64/libAncHumanVideo-jni.so
-my_product/lib64/libApsFaceBeautyPreviewProductJni.so:system_ext/lib64/libApsFaceBeautyPreviewProductJni.so
+my_product/lib64/libApsFaceBeautyPreviewProductJni.so:system_ext/lib64/libApsFaceBeautyPreviewProductJni.so;FIX_SONAME
 my_product/lib64/libAvatarEngineRender.so:system_ext/lib64/libAvatarEngineRender.so
 my_product/lib64/libAvatarEngineRenderNative.so:system_ext/lib64/libAvatarEngineRenderNative.so
 my_product/lib64/libCombineLut.so:system_ext/lib64/libCombineLut.so
 my_product/lib64/libCombineLutJni.so:system_ext/lib64/libCombineLutJni.so
 my_product/lib64/libFileExtender-jni.so:system_ext/lib64/libFileExtender-jni.so
 my_product/lib64/libOplusBlurPreviewJNI.so:system_ext/lib64/libOplusBlurPreviewJNI.so
-my_product/lib64/libSuperTextWrapper.so:system_ext/lib64/libSuperTextWrapper.so
+my_product/lib64/libSuperTextWrapper.so:system_ext/lib64/libSuperTextWrapper.so;MODULE_SUFFIX=_system_ext
 my_product/lib64/libXDocProcessSDK-jni.so:system_ext/lib64/libXDocProcessSDK-jni.so
-my_product/lib64/libXDocProcessSDK.so:system_ext/lib64/libXDocProcessSDK.so
-my_product/lib64/libYTCommon.so:system_ext/lib64/libYTCommon.so
+my_product/lib64/libXDocProcessSDK.so:system_ext/lib64/libXDocProcessSDK.so;MODULE_SUFFIX=_system_ext
+my_product/lib64/libYTCommon.so:system_ext/lib64/libYTCommon.so;MODULE_SUFFIX=_system_ext
 my_product/lib64/libarcsoft_wideselfie.so:system_ext/lib64/libarcsoft_wideselfie.so
 my_product/lib64/libcolorx-loader.so:system_ext/lib64/libcolorx-loader.so
 my_product/lib64/libcolorx.so:system_ext/lib64/libcolorx.so
 my_product/lib64/libcoolex.so:system_ext/lib64/libcoolex.so
 my_product/lib64/libextendfile.so:system_ext/lib64/libextendfile.so
 my_product/lib64/libjni_wideselfie.so:system_ext/lib64/libjni_wideselfie.so
-my_product/lib64/libjnisingleblur_api.so:system_ext/lib64/libjnisingleblur_api.so
-my_product/lib64/libjnistblur_api.so:system_ext/lib64/libjnistblur_api.so
-my_product/lib64/libmpbase.so:system_ext/lib64/libmpbase.so
+my_product/lib64/libjnisingleblur_api.so:system_ext/lib64/libjnisingleblur_api.so;FIX_SONAME
+my_product/lib64/libjnistblur_api.so:system_ext/lib64/libjnistblur_api.so;FIX_SONAME
+my_product/lib64/libmpbase.so:system_ext/lib64/libmpbase.so;MODULE_SUFFIX=_system_ext
 my_product/lib64/libsingle_camera_bokeh_native.so:system_ext/lib64/libsingle_camera_bokeh_native.so
 my_product/lib64/libst_mobile.so:system_ext/lib64/libst_mobile.so
-my_product/lib64/libst_sticker_jni.so:system_ext/lib64/libst_sticker_jni.so
+my_product/lib64/libst_sticker_jni.so:system_ext/lib64/libst_sticker_jni.so;FIX_SONAME
 my_product/product_overlay/etc/permissions/oplus_camera_default_grant_permissions_list.xml:system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml
 my_product/product_overlay/framework/com.oplus.camera.unit.sdk.adapter.jar:system_ext/framework/com.oplus.camera.unit.sdk.adapter.jar
 my_product/product_overlay/framework/com.oplus.camera.unit.sdk.jar:system_ext/framework/com.oplus.camera.unit.sdk.jar
-odm/lib64/libXDocProcessSDK.so
-odm/lib64/libarcsoft_turbo_fusion_raw_portrait_super_night.so
-odm/lib64/libarcsoft_turbo_fusion_raw_super_night.so
-odm/lib64/libarcsoft_turbo_hdr_grf.so
-odm/lib64/libarcsoft_turbo_hdr_raw.so
-odm/lib64/libarcsoft_turbo_hdr_raw_front.so
-odm/lib64/libarcsoft_turbo_raw.so
-odm/lib64/libtrace.so
 system/framework/oplus-support-wrapper.jar
 system_ext/lib64/libpenguin.so:vendor/lib64/libpenguin.so
 system_ext/lib64/libHeifEncoderWrapper.so
 system_ext/lib64/libNativeWinBuffExchange.so
 system_ext/lib64/liboplusheifwriter.so
 system_ext/priv-app/OplusAppPlatform/OplusAppPlatform.apk
-odm/lib64/libOPAlgoCamAIBeautyBodyDetection.so
-odm/lib64/libOPAlgoCamAiBeautyEyeRetouchCn.so
-odm/lib64/libOPAlgoCamAiBeautyFaceRetouchCn.so
-odm/lib64/libOPAlgoCamAiUnifySkin.so
-odm/lib64/libOPAlgoCamFaceBeautyCap.so
-odm/lib64/libOPAlgoCamFaceRestore.so
-odm/lib64/libOPAlgoCamHybridRaw.so
-odm/lib64/libOPAlgoCamSinglePortrait.so
-odm/lib64/libCaptureBokeh.so
diff --git a/proprietary/odm/lib64/libCaptureBokeh.so b/proprietary/odm/lib64/libCaptureBokeh.so
deleted file mode 100644
index fcf61af..0000000
Binary files a/proprietary/odm/lib64/libCaptureBokeh.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamAIBeautyBodyDetection.so b/proprietary/odm/lib64/libOPAlgoCamAIBeautyBodyDetection.so
deleted file mode 100644
index 0fc9793..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamAIBeautyBodyDetection.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamAiBeautyEyeRetouchCn.so b/proprietary/odm/lib64/libOPAlgoCamAiBeautyEyeRetouchCn.so
deleted file mode 100644
index beab6cb..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamAiBeautyEyeRetouchCn.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamAiBeautyFaceRetouchCn.so b/proprietary/odm/lib64/libOPAlgoCamAiBeautyFaceRetouchCn.so
deleted file mode 100644
index 77b2f49..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamAiBeautyFaceRetouchCn.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamAiUnifySkin.so b/proprietary/odm/lib64/libOPAlgoCamAiUnifySkin.so
deleted file mode 100644
index 4a5d4da..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamAiUnifySkin.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamFaceBeautyCap.so b/proprietary/odm/lib64/libOPAlgoCamFaceBeautyCap.so
deleted file mode 100644
index 4138948..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamFaceBeautyCap.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamFaceRestore.so b/proprietary/odm/lib64/libOPAlgoCamFaceRestore.so
deleted file mode 100644
index 9700210..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamFaceRestore.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamHybridRaw.so b/proprietary/odm/lib64/libOPAlgoCamHybridRaw.so
deleted file mode 100644
index 17eb266..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamHybridRaw.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libOPAlgoCamSinglePortrait.so b/proprietary/odm/lib64/libOPAlgoCamSinglePortrait.so
deleted file mode 100644
index 4f11f41..0000000
Binary files a/proprietary/odm/lib64/libOPAlgoCamSinglePortrait.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libXDocProcessSDK.so b/proprietary/odm/lib64/libXDocProcessSDK.so
deleted file mode 100644
index e97a041..0000000
Binary files a/proprietary/odm/lib64/libXDocProcessSDK.so and /dev/null differ
diff --git a/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_portrait_super_night.so b/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_portrait_super_night.so
deleted file mode 100644
index b2ce34a..0000000
--- a/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_portrait_super_night.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1098f62c8a8f62ef46a2fc263d5b00eac0d19014f513014a215699b0b68b792
-size 36132584
diff --git a/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_super_night.so b/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_super_night.so
deleted file mode 100644
index bc0c1d7..0000000
--- a/proprietary/odm/lib64/libarcsoft_turbo_fusion_raw_super_night.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86594b1c43fba6f3355739205400b14d036f7c5adce9cb630786ba555b6bb31a
-size 44290480
diff --git a/proprietary/odm/lib64/libarcsoft_turbo_hdr_grf.so b/proprietary/odm/lib64/libarcsoft_turbo_hdr_grf.so
deleted file mode 100644
index ad85094..0000000
--- a/proprietary/odm/lib64/libarcsoft_turbo_hdr_grf.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14502bd0a27120e588388550c6f90838c694adb5d29e9f6a8e99bfbb3b29003b
-size 204392
diff --git a/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw.so b/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw.so
deleted file mode 100644
index f754e01..0000000
--- a/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:440cad4fc1fcb3b28e869f7acecde26b1b7d58aa942113a6c8521a227ccf9d76
-size 149195088
diff --git a/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw_front.so b/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw_front.so
deleted file mode 100644
index c749513..0000000
--- a/proprietary/odm/lib64/libarcsoft_turbo_hdr_raw_front.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea4caeeb56001877a489c429596f29a9491c1c4f824b2fcc6c67b421e3b85db2
-size 53784400
diff --git a/proprietary/odm/lib64/libarcsoft_turbo_raw.so b/proprietary/odm/lib64/libarcsoft_turbo_raw.so
deleted file mode 100644
index 6028e03..0000000
--- a/proprietary/odm/lib64/libarcsoft_turbo_raw.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5aa73ddae44dd669c801d6bbf43a3667d07fa84d68a79ea1b0344e2c6afdc4be
-size 210984
diff --git a/proprietary/odm/lib64/libtrace.so b/proprietary/odm/lib64/libtrace.so
deleted file mode 100644
index 0d9d051..0000000
Binary files a/proprietary/odm/lib64/libtrace.so and /dev/null differ
diff --git a/proprietary/system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml b/proprietary/system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml
index 42d4fcc..e57f08a 100644
--- a/proprietary/system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml
+++ b/proprietary/system_ext/etc/default-permissions/oplus_camera_default_grant_permissions_list.xml
@@ -20,4 +20,4 @@
         <permission name="android.permission.READ_EXTERNAL_STORAGE"/>
         <permission name="android.permission.READ_PHONE_STATE"/>
     </default-grant-permissions>
-</packages>
+</packages>
\ No newline at end of file
diff --git a/proprietary/system_ext/lib64/libApsFaceBeautyPreviewProductJni.so b/proprietary/system_ext/lib64/libApsFaceBeautyPreviewProductJni.so
index 8334cce..82131bd 100644
Binary files a/proprietary/system_ext/lib64/libApsFaceBeautyPreviewProductJni.so and b/proprietary/system_ext/lib64/libApsFaceBeautyPreviewProductJni.so differ
diff --git a/proprietary/system_ext/lib64/libjnisingleblur_api.so b/proprietary/system_ext/lib64/libjnisingleblur_api.so
index 7925c42..e6b5249 100644
Binary files a/proprietary/system_ext/lib64/libjnisingleblur_api.so and b/proprietary/system_ext/lib64/libjnisingleblur_api.so differ
diff --git a/proprietary/system_ext/lib64/libjnistblur_api.so b/proprietary/system_ext/lib64/libjnistblur_api.so
index 119a3a0..705ff47 100644
Binary files a/proprietary/system_ext/lib64/libjnistblur_api.so and b/proprietary/system_ext/lib64/libjnistblur_api.so differ
diff --git a/proprietary/system_ext/lib64/libst_sticker_jni.so b/proprietary/system_ext/lib64/libst_sticker_jni.so
index 4b42908..4860e7a 100644
Binary files a/proprietary/system_ext/lib64/libst_sticker_jni.so and b/proprietary/system_ext/lib64/libst_sticker_jni.so differ
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 5f964f4..fc7ecb6 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 #
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2023 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -24,13 +23,37 @@ if [ ! -f "${HELPER}" ]; then
 fi
 source "${HELPER}"
 
+function lib_to_package_fixup_system_ext_variants() {
+    if [ "$2" != "system_ext" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        libSuperTextWrapper | \
+            libXDocProcessSDK | \
+            libYTCommon | \
+            libmpbase)
+            echo "$1_system_ext"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_system_ext_variants "$@"
+}
+
 # Initialize the helper
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
 
 # Warning headers and guards
 write_headers
 
-write_makefiles "${MY_DIR}/proprietary-files.txt" true
+write_makefiles "${MY_DIR}/proprietary-files.txt"
 
 # Finish
 write_footers