diff --git a/Android.bp b/Android.bp
index e9fd34b..eb83426 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,6 +4,9 @@
 
 soong_namespace {
 	imports: [
+		"device/realme/RM6785-common",
+		"hardware/mediatek",
+		"hardware/mediatek/libmtkperf_client",
 	],
 }
 
@@ -15,11 +18,11 @@ cc_prebuilt_library_shared {
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/lib64/libaptXHD_encoder.so"],
+			srcs: ["proprietary//lib64/libaptXHD_encoder.so"],
+			shared_libs: ["libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 }
 
@@ -31,11 +34,11 @@ cc_prebuilt_library_shared {
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/lib64/libaptX_encoder.so"],
+			srcs: ["proprietary//lib64/libaptX_encoder.so"],
+			shared_libs: ["libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 }
 
@@ -48,13 +51,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/arm.graphics-V1-ndk_platform.so"],
+			shared_libs: ["libbinder_ndk", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/arm.graphics-V1-ndk_platform.so"],
+			shared_libs: ["libbinder_ndk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -68,13 +72,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/egl/libGLES_mali.so"],
+			shared_libs: ["liblog", "libz", "libnativewindow", "libged", "libgpu_aux", "libgpud", "libgralloc_extra", "libcutils", "android.hardware.graphics.mapper@4.0", "libgralloctypes", "libhidlbase", "libutils", "libm", "libc", "libdl", "libc++", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/egl/libGLES_mali.so"],
+			shared_libs: ["liblog", "libz", "libnativewindow", "libged", "libgpu_aux", "libgpud", "libgralloc_extra", "libcutils", "android.hardware.graphics.mapper@4.0", "libgralloctypes", "libhidlbase", "libutils", "libm", "libc", "libdl", "libc++", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "egl",
 	prefer: true,
 	soc_specific: true,
@@ -89,13 +94,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/egl/libGLES_meow.so"],
+			shared_libs: ["libcutils", "liblog", "libnativewindow", "libhidlbase", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/egl/libGLES_meow.so"],
+			shared_libs: ["libcutils", "liblog", "libnativewindow", "libhidlbase", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "egl",
 	prefer: true,
 	soc_specific: true,
@@ -110,13 +116,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/egl/libMEOW_trace.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libnativewindow", "libGLES_meow", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/egl/libMEOW_trace.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libnativewindow", "libGLES_meow", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "egl",
 	prefer: true,
 	soc_specific: true,
@@ -131,13 +138,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/android.hardware.graphics.allocator@4.0-impl-mediatek.so"],
+			shared_libs: ["libgralloc_extra", "libgralloc_metadata", "libgralloctypes_mtk", "libged", "libgpud", "libion_mtk", "libhardware", "liblog", "libcutils", "libion", "libsync", "libutils", "libnativewindow", "libhidlbase", "libgralloctypes", "libdrm", "android.hardware.graphics.allocator@4.0", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/android.hardware.graphics.allocator@4.0-impl-mediatek.so"],
+			shared_libs: ["libgralloc_extra", "libgralloc_metadata", "libgralloctypes_mtk", "libged", "libgpud", "libion_mtk", "libhardware", "liblog", "libcutils", "libion", "libsync", "libutils", "libnativewindow", "libhidlbase", "libgralloctypes", "libdrm", "android.hardware.graphics.allocator@4.0", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -152,13 +160,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/android.hardware.graphics.mapper@4.0-impl-mediatek.so"],
+			shared_libs: ["libgralloc_extra", "libgralloc_metadata", "libgralloctypes_mtk", "libged", "libgpud", "libion_mtk", "libhardware", "liblog", "libcutils", "libion", "libsync", "libutils", "libnativewindow", "libhidlbase", "libgralloctypes", "libdrm", "arm.graphics-V1-ndk_platform", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/android.hardware.graphics.mapper@4.0-impl-mediatek.so"],
+			shared_libs: ["libgralloc_extra", "libgralloc_metadata", "libgralloctypes_mtk", "libged", "libgpud", "libion_mtk", "libhardware", "liblog", "libcutils", "libion", "libsync", "libutils", "libnativewindow", "libhidlbase", "libgralloctypes", "libdrm", "arm.graphics-V1-ndk_platform", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -173,13 +182,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/gps.default.so"],
+			shared_libs: ["liblog", "libcutils", "libhardware", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/gps.default.so"],
+			shared_libs: ["liblog", "libcutils", "libhardware", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -194,13 +204,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/vendor.mediatek.hardware.keyinstall@1.0-impl.so"],
+			shared_libs: ["liblog", "libhidlbase", "libhidltransport", "libutils", "libhardware", "liburee_meta_drmkeyinstall", "vendor.mediatek.hardware.keyinstall@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.keyinstall@1.0-impl.so"],
+			shared_libs: ["liblog", "libhidlbase", "libhidltransport", "libutils", "libhardware", "liburee_meta_drmkeyinstall", "vendor.mediatek.hardware.keyinstall@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -215,13 +226,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/vendor.mediatek.hardware.mms@1.5-impl.so"],
+			shared_libs: ["libhidlbase", "libhidltransport", "libhwbinder", "liblog", "libutils", "libcutils", "libion", "libion_mtk", "libhardware", "libdpframework", "libgralloc_extra", "libsync", "vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "vendor.mediatek.hardware.mms@1.3", "vendor.mediatek.hardware.mms@1.4", "vendor.mediatek.hardware.mms@1.5", "libJpgEncPipe", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.mms@1.5-impl.so"],
+			shared_libs: ["libhidlbase", "libhidltransport", "libhwbinder", "liblog", "libutils", "libcutils", "libion", "libion_mtk", "libhardware", "libdpframework", "libgralloc_extra", "libsync", "vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "vendor.mediatek.hardware.mms@1.3", "vendor.mediatek.hardware.mms@1.4", "vendor.mediatek.hardware.mms@1.5", "libJpgEncPipe", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -236,13 +248,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/vendor.mediatek.hardware.nvram@1.1-impl.so"],
+			shared_libs: ["libbase", "libcutils", "libhardware", "libhidlbase", "libhidltransport", "liblog", "libutils", "libnvram", "libfile_op", "vendor.mediatek.hardware.nvram@1.0", "vendor.mediatek.hardware.nvram@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.nvram@1.1-impl.so"],
+			shared_libs: ["libbase", "libcutils", "libhardware", "libhidlbase", "libhidltransport", "liblog", "libutils", "libnvram", "libfile_op", "vendor.mediatek.hardware.nvram@1.0", "vendor.mediatek.hardware.nvram@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -257,18 +270,40 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/vendor.mediatek.hardware.pq@2.6-impl.so"],
+			shared_libs: ["libhidlbase", "libhidltransport", "libhwbinder", "liblog", "libutils", "libcutils", "libpq_prot", "libhidlmemory", "vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "vendor.mediatek.hardware.pq@2.5", "vendor.mediatek.hardware.pq@2.6", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libdrm", "libaalservice", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.pq@2.6-impl.so"],
+			shared_libs: ["libhidlbase", "libhidltransport", "libhwbinder", "liblog", "libutils-v32", "libcutils", "libpq_prot", "libhidlmemory", "vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "vendor.mediatek.hardware.pq@2.5", "vendor.mediatek.hardware.pq@2.6", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libdrm", "libaalservice", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "libJpgEncPipe",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libJpgEncPipe.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libjpeg-alpha_vendor", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libJpgEncPipe.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libjpeg-alpha_vendor", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "libOpenCL",
 	owner: "realme",
@@ -278,13 +313,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libOpenCL.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libOpenCL.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -298,13 +334,56 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libTEECommon.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libTEECommon.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaal_mtk",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaal_mtk.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libaal_mtk.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libaalservice",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libaalservice.so"],
+			shared_libs: ["libshim_sensors", "libutils", "libcutils", "liblog", "libaal_mtk", "libhardware", "libhidlbase", "libgralloc_extra", "android.frameworks.sensorservice@1.0", "android.hardware.sensors@1.0", "libsensorndkbridge", "libdrm", "libc++", "libc", "libm", "libdl", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libaalservice.so"],
+			shared_libs: ["libshim_sensors", "libutils", "libcutils", "liblog", "libaal_mtk", "libhardware", "libhidlbase", "libgralloc_extra", "android.frameworks.sensorservice@1.0", "android.hardware.sensors@1.0", "libsensorndkbridge", "libdrm", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -318,13 +397,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaedv.so"],
+			shared_libs: ["libcutils", "libbase", "libunwindstack", "liblog", "libz", "libc", "libdl", "libm", "libc++", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libaedv.so"],
+			shared_libs: ["libcutils", "libbase", "libunwindstack", "liblog", "libz", "libc", "libdl", "libm", "libc++", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -338,13 +418,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libbwc.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbwc.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -358,13 +439,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcapctrl.so"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcapctrl.so"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -378,13 +460,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcares_naptr.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcares_naptr.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -398,13 +481,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcarrierconfig.so"],
+			shared_libs: ["libmtkcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcarrierconfig.so"],
+			shared_libs: ["libmtkcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -418,13 +502,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libccci_util.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libccci_util.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -438,13 +523,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcharon-ss.so"],
+			shared_libs: ["libcutils", "libsimaka", "libstrongswan", "libhydra", "liblog", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcharon-ss.so"],
+			shared_libs: ["libcutils", "libsimaka", "libstrongswan", "libhydra", "liblog", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -458,13 +544,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcrypto-md.so"],
+			shared_libs: ["liblog", "libdl", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcrypto-md.so"],
+			shared_libs: ["liblog", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -478,13 +565,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcrypto-ss.so"],
+			shared_libs: ["libcutils", "liblog", "libdl", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcrypto-ss.so"],
+			shared_libs: ["libcutils", "liblog", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -498,13 +586,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcurl-md.so"],
+			shared_libs: ["libssl-md", "libcrypto-md", "libz", "liblog", "libc", "libdl", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcurl-md.so"],
+			shared_libs: ["libssl-md", "libcrypto-md", "libz", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -518,13 +607,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcurl-ss.so"],
+			shared_libs: ["libssl-ss", "libcrypto-ss", "libz", "libm", "liblog", "libc", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcurl-ss.so"],
+			shared_libs: ["libssl-ss", "libcrypto-ss", "libz", "libm", "liblog", "libc", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -538,13 +628,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcustom_nvram.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcustom_nvram.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -558,13 +649,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libdpframework.so"],
+			shared_libs: ["libhidlbase", "libhidlmemory", "vendor.mediatek.hardware.pq@2.0", "libion_mtk", "libgralloc_extra", "libpq_prot", "libutils", "libion", "libcutils", "liblog", "libsync", "libhardware", "libnativewindow", "libutilscallstack", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libdpframework.so"],
+			shared_libs: ["libhidlbase", "libhidlmemory", "vendor.mediatek.hardware.pq@2.0", "libion_mtk", "libgralloc_extra", "libpq_prot", "libutils", "libion", "libcutils", "liblog", "libsync", "libhardware", "libnativewindow", "libutilscallstack", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -578,13 +670,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libfile_op.so"],
+			shared_libs: ["libcutils", "libnvram", "libcustom_nvram", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfile_op.so"],
+			shared_libs: ["libcutils", "libnvram", "libcustom_nvram", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -598,13 +691,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libged.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libsync", "libnativewindow", "libhidlbase", "vendor.mediatek.hardware.gpu@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libged.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libsync", "libnativewindow", "libhidlbase", "vendor.mediatek.hardware.gpu@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -618,13 +712,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libgpu_aux.so"],
+			shared_libs: ["libdpframework", "liblog", "libutils", "libcutils", "libhardware", "libnativewindow", "libgralloc_extra", "libsync", "libgpud", "libhidlbase", "libgralloctypes", "android.hardware.graphics.common@1.0", "android.hardware.graphics.common@1.1", "android.hardware.graphics.common@1.2", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@4.0", "vendor.mediatek.hardware.mms@1.5", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libgpu_aux.so"],
+			shared_libs: ["libdpframework", "liblog", "libutils", "libcutils", "libhardware", "libnativewindow", "libgralloc_extra", "libsync", "libgpud", "libhidlbase", "libgralloctypes", "android.hardware.graphics.common@1.0", "android.hardware.graphics.common@1.1", "android.hardware.graphics.common@1.2", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@4.0", "vendor.mediatek.hardware.mms@1.5", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -638,13 +733,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libgpud.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libsync", "libhardware", "libnativewindow", "libgralloc_extra", "libhidlbase", "libgralloctypes", "android.hardware.graphics.common@1.1", "android.hardware.graphics.common@1.2", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@4.0", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libgpud.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libsync", "libhardware", "libnativewindow", "libgralloc_extra", "libhidlbase", "libgralloctypes", "android.hardware.graphics.common@1.1", "android.hardware.graphics.common@1.2", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@4.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -658,13 +754,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libgralloc_extra.so"],
+			shared_libs: ["libhardware", "libcutils", "libutils", "liblog", "libion", "libged", "libutilscallstack", "android.hardware.graphics.common@1.2", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libgralloc_extra.so"],
+			shared_libs: ["libhardware", "libcutils", "libutils", "liblog", "libion", "libged", "libutilscallstack", "android.hardware.graphics.common@1.2", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -678,13 +775,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libgralloc_metadata.so"],
+			shared_libs: ["android.hardware.graphics.mapper@4.0", "libhidlbase", "libcutils", "libutils", "liblog", "libion", "libc", "libc++", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libgralloc_metadata.so"],
+			shared_libs: ["android.hardware.graphics.mapper@4.0", "libhidlbase", "libcutils", "libutils", "liblog", "libion", "libc", "libc++", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -698,13 +796,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libgralloctypes_mtk.so"],
+			shared_libs: ["android.hardware.graphics.mapper@4.0", "libhidlbase", "libhardware", "libcutils", "libutils", "liblog", "libion", "libc", "libc++", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libgralloctypes_mtk.so"],
+			shared_libs: ["android.hardware.graphics.mapper@4.0", "libhidlbase", "libhardware", "libcutils", "libutils", "liblog", "libion", "libc", "libc++", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -718,13 +817,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libhdrvideo.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libhdrvideo.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -738,13 +838,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libhwm.so"],
+			shared_libs: ["libnvram", "liblog", "libfile_op", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libhwm.so"],
+			shared_libs: ["libnvram", "liblog", "libfile_op", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -758,13 +859,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libhydra.so"],
+			shared_libs: ["libcutils", "libstrongswan", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libhydra.so"],
+			shared_libs: ["libcutils", "libstrongswan", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -778,13 +880,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libion_mtk.so"],
+			shared_libs: ["libion", "liblog", "libion_ulit", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libion_mtk.so"],
+			shared_libs: ["libion", "liblog", "libion_ulit", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -798,13 +901,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libion_ulit.so"],
+			shared_libs: ["libutils", "liblog", "libladder", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libion_ulit.so"],
+			shared_libs: ["libutils", "liblog", "libladder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -818,13 +922,56 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libipsec_ims_shr.so"],
+			shared_libs: ["libcutils", "libcrypto", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libipsec_ims_shr.so"],
+			shared_libs: ["libcutils", "libcrypto", "liblog", "libc++", "libc", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libjpeg-alpha-oal_vendor",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libjpeg-alpha-oal_vendor.so"],
+			shared_libs: ["libc++", "libdl", "libc", "libm", "liblog", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libjpeg-alpha-oal_vendor.so"],
+			shared_libs: ["libc++", "libdl", "libc", "libm", "liblog", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libjpeg-alpha_vendor",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/libjpeg-alpha_vendor.so"],
+			shared_libs: ["libjpeg-alpha-oal_vendor", "libc++", "libdl", "libc", "libm", "liblog", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libjpeg-alpha_vendor.so"],
+			shared_libs: ["libjpeg-alpha-oal_vendor", "libc++", "libdl", "libc", "libm", "liblog", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -838,13 +985,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libladder.so"],
+			shared_libs: ["libunwindstack", "liblog", "libbase", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libladder.so"],
+			shared_libs: ["libunwindstack", "liblog", "libbase", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -858,13 +1006,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtcloader.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtcloader.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -878,13 +1027,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtk_drvb.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtk_drvb.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -898,13 +1048,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtkares.so"],
+			shared_libs: ["libcares_naptr", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkares.so"],
+			shared_libs: ["libcares_naptr", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -918,13 +1069,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtkcutils.so"],
+			shared_libs: ["libmtkrillog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcutils.so"],
+			shared_libs: ["libmtkrillog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -938,13 +1090,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtkhardware_legacy.so"],
+			shared_libs: ["libhardware_legacy", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkhardware_legacy.so"],
+			shared_libs: ["libhardware_legacy", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -958,13 +1111,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtknetutils.so"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtknetutils.so"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -978,13 +1132,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtkproperty.so"],
+			shared_libs: ["libmtkrillog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkproperty.so"],
+			shared_libs: ["libmtkrillog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -998,13 +1153,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtkrillog.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkrillog.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1018,13 +1174,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtksysutils.so"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libmtkcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtksysutils.so"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libmtkcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1038,13 +1195,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libnvram.so"],
+			shared_libs: ["libcutils", "libcustom_nvram", "libnvram_platform", "libbase", "liblog", "libnvram_sec", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnvram.so"],
+			shared_libs: ["libcutils", "libcustom_nvram", "libnvram_platform", "libbase", "liblog", "libnvram_sec", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1058,13 +1216,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libnvram_daemon_callback.so"],
+			shared_libs: ["liblog", "libcustom_nvram", "libnvram", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnvram_daemon_callback.so"],
+			shared_libs: ["liblog", "libcustom_nvram", "libnvram", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1078,13 +1237,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libnvram_platform.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnvram_platform.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1098,13 +1258,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libnvram_sec.so"],
+			shared_libs: ["libcutils", "libcustom_nvram", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnvram_sec.so"],
+			shared_libs: ["libcutils", "libcustom_nvram", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1118,13 +1279,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libpixelflinger.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libpixelflinger.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1138,13 +1300,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libpq_cust_base.so"],
+			shared_libs: ["libcutils", "libdpframework", "libpq_prot", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libpq_cust_base.so"],
+			shared_libs: ["libcutils", "libdpframework", "libpq_prot", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1158,13 +1321,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libpq_prot.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libpq_prot.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1178,13 +1342,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/librgbwlightsensor.so"],
+			shared_libs: ["libcutils", "libutils", "libhardware", "liblog", "libhidlbase", "android.frameworks.sensorservice@1.0", "android.hardware.sensors@1.0", "libsensorndkbridge", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/librgbwlightsensor.so"],
+			shared_libs: ["libcutils", "libutils", "libhardware", "liblog", "libhidlbase", "android.frameworks.sensorservice@1.0", "android.hardware.sensors@1.0", "libsensorndkbridge", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1198,13 +1363,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libscltm.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libscltm.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1218,13 +1384,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libsimaka.so"],
+			shared_libs: ["libstrongswan", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libsimaka.so"],
+			shared_libs: ["libstrongswan", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1238,13 +1405,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libssl-md.so"],
+			shared_libs: ["libcrypto-md", "liblog", "libc", "libdl", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libssl-md.so"],
+			shared_libs: ["libcrypto-md", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1258,13 +1426,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libssl-ss.so"],
+			shared_libs: ["libcrypto-ss", "libcutils", "liblog", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libssl-ss.so"],
+			shared_libs: ["libcrypto-ss", "libcutils", "liblog", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1278,13 +1447,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libstrongswan.so"],
+			shared_libs: ["libssl-ss", "libcurl-ss", "libcrypto-ss", "libcutils", "libdl", "libc", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libstrongswan.so"],
+			shared_libs: ["libssl-ss", "libcurl-ss", "libcrypto-ss", "libcutils", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1298,13 +1468,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libsysenv.so"],
+			shared_libs: ["liblog", "libbase", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libsysenv.so"],
+			shared_libs: ["liblog", "libbase", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1318,13 +1489,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/liburee_meta_drmkeyinstall.so"],
+			shared_libs: ["libTEECommon", "libcutils", "libnetutils", "liblog", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/liburee_meta_drmkeyinstall.so"],
+			shared_libs: ["libTEECommon", "libcutils", "libnetutils", "liblog", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1338,13 +1510,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libverno.so"],
+			shared_libs: ["libc", "libdl", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libverno.so"],
+			shared_libs: ["libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1358,13 +1531,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvpu.so"],
+			shared_libs: ["libbase", "libion", "liblog", "libcutils", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libvpu.so"],
+			shared_libs: ["libbase", "libion", "liblog", "libcutils", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1378,13 +1552,35 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libwo.so"],
+			shared_libs: ["libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libwo.so"],
+			shared_libs: ["libcutils", "liblog", "libc", "libdl", "libm", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.mediatek.hardware.audio@6.1",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.audio@6.1.so"],
+			shared_libs: ["android.hardware.audio.common@6.0", "android.hardware.audio.effect@6.0", "android.hardware.audio@6.0", "android.hidl.safe_union@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.audio@6.1.so"],
+			shared_libs: ["android.hardware.audio.common@6.0", "android.hardware.audio.effect@6.0", "android.hardware.audio@6.0", "android.hidl.safe_union@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1398,13 +1594,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so"],
+			shared_libs: ["android.hardware.audio.common@5.0", "android.hidl.safe_union@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so"],
+			shared_libs: ["android.hardware.audio.common@5.0", "android.hidl.safe_union@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1418,13 +1615,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.gpu@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.gpu@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1438,13 +1636,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.keyinstall@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.keyinstall@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1458,13 +1657,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mms@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mms@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1478,13 +1678,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mms@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mms@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1498,13 +1699,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mms@1.2.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mms@1.2.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1518,13 +1720,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mms@1.3.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mms@1.3.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1538,13 +1741,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mms@1.4.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "vendor.mediatek.hardware.mms@1.3", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mms@1.4.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "vendor.mediatek.hardware.mms@1.3", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1558,13 +1762,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mms@1.5.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "vendor.mediatek.hardware.mms@1.3", "vendor.mediatek.hardware.mms@1.4", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mms@1.5.so"],
+			shared_libs: ["vendor.mediatek.hardware.mms@1.0", "vendor.mediatek.hardware.mms@1.1", "vendor.mediatek.hardware.mms@1.2", "vendor.mediatek.hardware.mms@1.3", "vendor.mediatek.hardware.mms@1.4", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1578,13 +1783,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.netdagent@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.netdagent@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1598,13 +1804,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.nvram@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.nvram@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1618,13 +1825,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.nvram@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.nvram@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.nvram@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.nvram@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1638,13 +1846,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1658,13 +1867,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1678,13 +1888,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.2.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.2.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1698,13 +1909,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.3.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.3.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1718,13 +1930,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.4.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.4.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1738,13 +1951,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.5.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.5.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1758,13 +1972,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.pq@2.6.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "vendor.mediatek.hardware.pq@2.5", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pq@2.6.so"],
+			shared_libs: ["vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "vendor.mediatek.hardware.pq@2.5", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1778,10 +1993,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/AVCSecureVdecCA.so"],
+			shared_libs: ["libTEECommon", "liblog", "libion", "libion_mtk", "libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1795,10 +2010,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/VP9SecureVdecCA.so"],
+			shared_libs: ["libTEECommon", "liblog", "libion", "libion_mtk", "libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1812,10 +2027,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/audio.primary.mt6785.so"],
+			shared_libs: ["libhidlbase", "vendor.mediatek.hardware.mtkpower@1.0", "liblog", "libcutils", "libutils", "libalsautils-v30", "libhardware_legacy", "libhardware", "libaudioutils", "libtinyalsa", "libtinyxml", "libaudiotoolkit_vendor", "libmedia_helper-v30", "libladder", "android.hardware.audio@6.0", "android.hardware.audio.common-util", "android.hardware.audio.common@6.0", "android.hardware.audio.common@6.0-util", "vendor.mediatek.hardware.audio@6.1", "libaudio_engineer_test", "libtinycompress", "libaedv", "libktveffect", "libktvreverb", "libktvsoundtouch", "libktvdrc", "libktveq", "libktvvolume", "libktveffect_rec", "libktvns", "liboplus_audio_config", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -1830,10 +2045,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/audio.r_submix.mt6785.so"],
+			shared_libs: ["liblog", "libcutils", "libmedia_helper", "libutils", "libnbaio_mono", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -1848,10 +2063,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/audio.usb.mt6785.so"],
+			shared_libs: ["liblog", "libcutils", "libutils", "libalsautils-v30", "libaudioutils", "libtinyalsa", "libtinycompress", "libaudiocustparam_vendor", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -1866,10 +2081,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/sound_trigger.primary.mt6785.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libhardware_legacy", "libhardware", "libmedia_helper", "vendor.mediatek.hardware.bluetooth.audio@2.1", "libvow_ap_testing_alexa.vendor", "libvowp2training_alexa.vendor", "libvowp23_sid_training_alexa.vendor", "libvowp23_sid_testing_alexa.vendor", "libvowp25testing_alexa.vendor", "libhidlbase", "vendor.mediatek.hardware.mtkpower@1.0", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -1884,10 +2099,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-impl.so"],
+			shared_libs: ["libhidlbase", "libhidltransport", "libhwbinder", "liblog", "libutils", "libcutils", "libhidlmemory", "vendor.mediatek.hardware.mtkcodecservice@1.1", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libaudioutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -1902,10 +2117,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libDR.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1936,10 +2151,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxAdpcmDec.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1953,10 +2168,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxAlacDec.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1970,10 +2185,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxApeDec.so"],
+			shared_libs: ["libutils", "libcutils", "libui", "liblog", "libhidlbase", "libhidltransport", "libhwbinder", "libhidlmemory", "vendor.mediatek.hardware.mtkcodecservice@1.1", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -1987,10 +2202,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxCore.so"],
+			shared_libs: ["libbinder", "libutils", "libcutils", "libui", "libion", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2004,10 +2219,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxGsmDec.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2021,10 +2236,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxMp3Dec.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2055,10 +2270,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxVenc.so"],
+			shared_libs: ["libbinder", "libutils", "libcutils", "liblog", "libui", "libion", "libion_mtk", "libgralloc_extra", "android.hardware.media@1.0", "android.hardware.media.omx@1.0", "libbwc", "android.hardware.graphics.common@1.2", "libvcodecdrv", "libvcodec_utility", "libhardware", "libdpframework", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2072,10 +2287,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkOmxWmaDec.so"],
+			shared_libs: ["libutils", "libcutils", "libmtk_drvb", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2089,10 +2304,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libMtkSpeechEnh.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2106,10 +2321,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/lib_iir.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2123,10 +2338,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/lib_speech_enh.so"],
+			shared_libs: ["libMtkSpeechEnh", "libcutils", "liblog", "libutils", "libaudioutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2140,10 +2355,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libalsautils-v30.so"],
+			shared_libs: ["liblog", "libcutils", "libtinyalsa", "libaudioutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2157,10 +2372,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudio_engineer_test.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libtinyalsa", "libexpat", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2174,10 +2389,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudio_param_parser-vnd.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libbinder", "libaudiocustparam_vendor", "libaudioprimarydevicehalifclient", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2191,10 +2406,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiocompensationfilter_vendor.so"],
+			shared_libs: ["libcustom_nvram", "libcutils", "liblog", "libutils", "libnvram", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2208,10 +2423,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiocompensationfilterc.so"],
+			shared_libs: ["libcustom_nvram", "libnvram", "libcutils", "libutils", "libaudiocustparam_vendor", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2225,10 +2440,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiocomponentengine_vendor.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libaudiodcrflt_vendor", "libblisrc32_vendor", "libmtklimiter_vendor", "libmtkshifter_vendor", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2242,10 +2457,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiocomponentenginec.so"],
+			shared_libs: ["libcutils", "libutils", "libblisrc32_vendor", "libmtklimiter_vendor", "libmtkshifter_vendor", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2259,10 +2474,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiocustparam_vendor.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libnvram", "libcustom_nvram", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2276,10 +2491,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiodcrflt_vendor.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2293,10 +2508,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiofmtconv.so"],
+			shared_libs: ["libcutils", "libutils", "libblisrc32_vendor", "libmtkshifter_vendor", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2310,10 +2525,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudioloudc.so"],
+			shared_libs: ["libaudiocompensationfilterc", "libbessound_hd_mtk_vendor", "libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2327,10 +2542,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudioprimarydevicehalifclient.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libbase", "libhwbinder", "libhidlbase", "android.hardware.audio@6.0", "android.hardware.audio.common@6.0", "android.hardware.audio.common@6.0-util", "libmedia_helper", "libbinder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2344,10 +2559,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaudiotoolkit_vendor.so"],
+			shared_libs: ["liblog", "libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2361,10 +2576,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libaurisysdemo.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2378,10 +2593,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libbessound_hd_mtk_vendor.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libm", "libc++", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2395,10 +2610,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libblisrc32_vendor.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libm", "libc++", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2412,10 +2627,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libcvsd_mtk.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libm", "libc++", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2429,10 +2644,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libfgauge_gm30.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2446,10 +2661,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libh264dec_customize.so"],
+			shared_libs: ["libc", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2548,10 +2763,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktvdrc.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2565,10 +2780,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktveffect.so"],
+			shared_libs: ["libcutils", "libutils", "libktvreverb", "libktvsoundtouch", "libktvdrc", "libktveq", "libktvvolume", "libktvns", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2582,10 +2797,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktveffect_rec.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2599,10 +2814,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktveq.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2616,10 +2831,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktvns.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2633,10 +2848,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktvreverb.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2650,10 +2865,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktvsoundtouch.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2667,10 +2882,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libktvvolume.so"],
+			shared_libs: ["libcutils", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2735,10 +2950,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmsbc_mtk.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libm", "libc++", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2752,10 +2967,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtklimiter_vendor.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libm", "libc++", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2769,10 +2984,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libmtkshifter_vendor.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libutils", "libm", "libc++", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2786,10 +3001,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/liboplus_audio_config.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libexpat", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2803,10 +3018,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libsi_sixth.so"],
+			shared_libs: ["libcutils", "libutils", "audio.primary.mt6785", "liboplus_audio_config", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2820,10 +3035,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libspeech_enh_lib.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2837,10 +3052,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libspeechparser_vendor.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libaudioutils", "libmedia_helper", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2854,10 +3069,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libstagefrighthw.so"],
+			shared_libs: ["libbinder", "libutils", "libcutils", "liblog", "libui", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2871,10 +3086,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libstorage_otp.so"],
+			shared_libs: ["libcutils", "libbase", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2888,10 +3103,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libthermalalgo.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2922,10 +3137,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libtlcWidevineModularDrm.so"],
+			shared_libs: ["libTEECommon", "liblog", "libutils", "libcutils", "libion_mtk", "libion", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2973,10 +3188,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvcodec_utility.so"],
+			shared_libs: ["libcutils", "libbwc", "liblog", "libion", "libion_mtk", "libmtk_drvb", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -2990,10 +3205,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvcodecdrv.so"],
+			shared_libs: ["libcutils", "liblog", "libvcodec_utility", "libvcodec_oal", "libmtk_drvb", "libion", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3007,10 +3222,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvolte_core_shr.so"],
+			shared_libs: ["libvolte_xdmc_shr", "libverno", "libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3024,10 +3239,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvolte_xdmc_shr.so"],
+			shared_libs: ["libverno", "libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3041,10 +3256,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvow_ap_testing_alexa.vendor.so"],
+			shared_libs: ["libcutils", "libutils", "libvowp2training_alexa.vendor", "libvowp23_sid_training_alexa.vendor", "libvowp23_sid_testing_alexa.vendor", "libvowp25testing_alexa.vendor", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3058,10 +3273,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvowp23_sid_testing_alexa.vendor.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3075,10 +3290,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvowp23_sid_training_alexa.vendor.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3092,10 +3307,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvowp25testing_alexa.vendor.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3109,10 +3324,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvowp2training_alexa.vendor.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3177,10 +3392,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvpud_vcodec.so"],
+			shared_libs: ["libcutils", "libvcodecdrv", "libvcodec_utility", "liblog", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3194,10 +3409,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libvt_custom.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3211,10 +3426,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/libwvhidl.so"],
+			shared_libs: ["libcrypto_shim", "android.hardware.drm@1.0", "android.hardware.drm@1.1", "android.hardware.drm@1.2", "android.hardware.drm@1.3", "android.hidl.memory@1.0", "libbase", "libcrypto", "libhidlbase", "libhidlmemory", "liblog", "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3228,32 +3443,15 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/mediadrm/libwvdrmengine.so"],
+			shared_libs: ["libcrypto_shim", "libbase", "libcrypto", "liblog", "libprotobuf-cpp-lite-3.9.1-vendorcompat", "libstagefright_foundation", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	relative_install_path: "mediadrm",
 	prefer: true,
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "vendor.mediatek.hardware.audio@6.1",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.audio@6.1.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "vendor.mediatek.hardware.mtkcodecservice@1.1",
 	owner: "realme",
@@ -3263,10 +3461,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/lib/vendor.mediatek.hardware.mtkcodecservice@1.1.so"],
+			shared_libs: ["android.hidl.memory@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3280,10 +3478,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/APUWareUtilsServer.so"],
+			shared_libs: ["liblog", "libhidlbase", "libutils", "libcutils", "vendor.mediatek.hardware.apuware.utils@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3297,10 +3495,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/APUWareXrpServer.so"],
+			shared_libs: ["libion", "libion_mtk", "libneuron_platform", "liblog", "libhidlbase", "libutils", "libcutils", "libhidlmemory", "libfmq", "vendor.mediatek.hardware.apuware.xrp@1.0", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3314,10 +3512,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/gc02k0_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3331,10 +3529,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/gc02k0_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_gc02k0mipiraw_Reserved", "libCamera_gc02k0mipiraw_Scene_Capture", "libCamera_gc02k0mipiraw_Scene_Preview", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3348,10 +3546,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/gc02m0_mipi_mono_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3365,10 +3563,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/gc02m0_mipi_mono_tuning.so"],
+			shared_libs: ["liblog", "libCamera_gc02m0mipimono_Capture_Preview", "libCamera_gc02m0mipimono_Default_Video", "libCamera_gc02m0mipimono_Production_Capture", "libCamera_gc02m0mipimono_Reserved", "libCamera_gc02m0mipimono_Scene_Capture", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3382,10 +3580,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/gc2375h_mipi_raw_19661_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3399,10 +3597,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/gc2375h_mipi_raw_19661_tuning.so"],
+			shared_libs: ["liblog", "libCamera_gc2375hmipiraw19661_Reserved", "libCamera_gc2375hmipiraw19661_Scene_Capture", "libCamera_gc2375hmipiraw19661_Scene_Preview", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3416,10 +3614,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-mediatek.so"],
+			shared_libs: ["android.hardware.bluetooth@1.0", "libbase", "libcutils", "libhardware", "libhidlbase", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3434,10 +3632,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/android.hardware.camera.provider@2.6-impl-mediatek.so"],
+			shared_libs: ["libshim_camera_metadata", "libmtkcam_device3_hidl", "liblog", "libutils", "libcutils", "libladder", "libhardware", "libhidlbase", "libhidltransport", "android.hardware.camera.common@1.0", "android.hardware.camera.provider@2.4", "android.hardware.camera.provider@2.5", "android.hardware.camera.provider@2.6", "android.hardware.camera.device@1.0", "android.hardware.camera.device@3.2", "libmtkcam_metadata", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_ulog", "libmtkcam_featureutils", "libcamera_metadata", "libfeatureiodrv_mem", "libmtkcam_diputils", "libmtkcam_metastore", "libmtkcam_hwutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3452,10 +3650,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-mediatek.so"],
+			shared_libs: ["liblog", "libhidlbase", "libhidltransport", "libutils", "android.hardware.gnss@1.0", "android.hardware.gnss@1.1", "android.hardware.gnss@2.0", "android.hardware.gnss@2.1", "android.hardware.gnss.measurement_corrections@1.0", "android.hardware.gnss.measurement_corrections@1.1", "android.hardware.gnss.visibility_control@1.0", "libhardware", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3470,10 +3668,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/dfps.mt6785.so"],
+			shared_libs: ["libcutils", "liblog", "libutils-v32", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3488,10 +3686,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/hwcomposer.mt6785.so"],
+			shared_libs: ["libui", "libutils", "libcutils", "liblog", "libsync", "libion", "libion_mtk", "libdpframework", "libhardware", "libgralloc_extra", "libbinder", "libpower", "libhidlbase", "libhwbinder", "libhidltransport", "libprocessgroup", "libbase", "libnativewindow", "libladder", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@4.0", "libgralloctypes", "libged", "libpq_prot", "vendor.mediatek.hardware.pq@2.0", "vendor.mediatek.hardware.pq@2.1", "vendor.mediatek.hardware.pq@2.2", "vendor.mediatek.hardware.pq@2.3", "vendor.mediatek.hardware.pq@2.4", "vendor.mediatek.hardware.pq@2.5", "vendor.mediatek.hardware.pq@2.6", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3506,10 +3704,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/kmsetkey.trustonic.so"],
+			shared_libs: ["libMcClient", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3524,10 +3722,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/libMcGatekeeper.so"],
+			shared_libs: ["libMcClient", "libgatekeeper", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3542,10 +3740,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/libSoftGatekeeper.so"],
+			shared_libs: ["libgatekeeper", "libhardware", "libbase", "libutils", "libcrypto", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3560,10 +3758,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/sensors.mt6785.so"],
+			shared_libs: ["liblog", "libcutils", "libutils", "libhardware", "libstagefright_foundation", "libksensor", "libhwm", "libhwm-oppo", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3578,10 +3776,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.bluetooth.audio@2.1-impl.so"],
+			shared_libs: ["vendor.mediatek.hardware.bluetooth.audio@2.1", "libbase", "libbluetooth_audio_session_mediatek", "libcutils", "libfmq", "libhidlbase", "liblog", "libutils", "libhardware", "android.hardware.audio@6.0", "android.hardware.audio.common@6.0", "android.hardware.audio.common@6.0-util", "vendor.mediatek.hardware.audio@6.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3596,10 +3794,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.camera.atms@1.0-impl.so"],
+			shared_libs: ["liblog", "libutils", "libhidlbase", "libhidlmemory", "libhidltransport", "vendor.mediatek.hardware.camera.atms@1.0", "libcutils", "libmtkcam.atmseventmgr", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3614,10 +3812,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcamera_metadata", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.camera.bgservice@1.0", "vendor.mediatek.hardware.camera.bgservice@1.1", "libmtkcam_stdutils", "libmtkcam.eventcallback", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3632,10 +3830,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.camera.isphal@1.0-impl.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libcamera_metadata", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.camera.isphal@1.0", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.common@1.0", "android.hardware.graphics.common@1.1", "libmtkcam_ulog", "libmtkcam_sysutils", "libmtkcam_stdutils", "libmtkcam_metadata", "libmtkcam_pipelinemodel_isp", "libmtkisp_metadata", "libmtkcam_streamutils", "libmtkcam_modulehelper", "libnativewindow", "libmtkcam_grallocutils", "libmtkcam_imgbuf", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3650,10 +3848,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.camera.lomoeffect@1.0-impl.so"],
+			shared_libs: ["liblog", "libutils", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.camera.lomoeffect@1.0", "android.hardware.camera.common@1.0", "android.hardware.camera.device@3.2", "android.hidl.memory@1.0", "libhidlmemory", "libion", "libion_mtk", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3668,10 +3866,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.camera.postproc@1.0-impl.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libcamera_metadata", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.camera.postproc@1.0", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.common@1.0", "android.hardware.graphics.common@1.1", "libmtkcam_stdutils", "libmtkcam_metadata", "libmtkcam_streamutils", "libmtkcam_modulehelper", "libnativewindow", "libmtkcam_grallocutils", "libmtkcam_imgbuf", "libchromanr", "libmtkcam.logicalmodule", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3686,10 +3884,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.dfps@1.0-impl.so"],
+			shared_libs: ["vendor.mediatek.hardware.dfps@1.0", "libbase", "libcutils", "libfmq", "libhardware", "libhidlbase", "libhidltransport", "liblog", "libsync", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3704,10 +3902,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-impl.so"],
+			shared_libs: ["liblog", "libhidlbase", "libhidltransport", "libutils", "libhardware", "vendor.mediatek.hardware.keymaster_attestation@1.0", "vendor.mediatek.hardware.keymaster_attestation@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3722,10 +3920,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so"],
+			shared_libs: ["libhidlbase", "libfmq", "vendor.mediatek.hardware.videotelephony@1.0_vendor", "libc", "libutils", "libcutils", "liblog", "libbase", "libc++", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "hw",
 	prefer: true,
 	soc_specific: true,
@@ -3740,10 +3938,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/imx471_mipi_raw1_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3757,10 +3955,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/imx471_mipi_raw1_tuning.so"],
+			shared_libs: ["liblog", "libCamera_imx471mipiraw1_3HDR_Preivew", "libCamera_imx471mipiraw1_3rd_Capture_1080P", "libCamera_imx471mipiraw1_3rd_Capture_480P", "libCamera_imx471mipiraw1_3rd_Capture_720P", "libCamera_imx471mipiraw1_3rd_Preview_1080P", "libCamera_imx471mipiraw1_3rd_Preview_480P", "libCamera_imx471mipiraw1_3rd_Preview_720P", "libCamera_imx471mipiraw1_FaceBeauty_Capture", "libCamera_imx471mipiraw1_FaceBeauty_Capture_Bining", "libCamera_imx471mipiraw1_FaceBeauty_Preview_Noface", "libCamera_imx471mipiraw1_FaceBeauty_Scene_Preview", "libCamera_imx471mipiraw1_FaceUnlock", "libCamera_imx471mipiraw1_Face_Capture", "libCamera_imx471mipiraw1_Face_Capture_superNS", "libCamera_imx471mipiraw1_Flash_Capture", "libCamera_imx471mipiraw1_Panorama", "libCamera_imx471mipiraw1_Production_Capture", "libCamera_imx471mipiraw1_Reserved", "libCamera_imx471mipiraw1_Scene_Capture", "libCamera_imx471mipiraw1_Scene_Capture_Bining", "libCamera_imx471mipiraw1_Scene_Preview", "libCamera_imx471mipiraw1_SlowMotion_Video", "libCamera_imx471mipiraw1_Video_Recording", "libCamera_imx471mipiraw1_WeChatQQ_1080P", "libCamera_imx471mipiraw1_WeChatQQ_480P", "libCamera_imx471mipiraw1_WeChatQQ_720P", "libCamera_imx471mipiraw1_YUVHDR_Capture", "libCamera_imx471mipiraw1_YUVHDR_Capture_Binning", "libCamera_imx471mipiraw1_subject_capture", "libCamera_imx471mipiraw1_zHDR_Capture_Binning", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3774,10 +3972,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/imx682_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3791,10 +3989,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/imx682_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_imx682mipiraw_3rd_Capture", "libCamera_imx682mipiraw_3rd_Capture2", "libCamera_imx682mipiraw_EIS_Video4K", "libCamera_imx682mipiraw_Face_Capture", "libCamera_imx682mipiraw_Face_Capture_64", "libCamera_imx682mipiraw_Face_Preview", "libCamera_imx682mipiraw_Flash_Capture", "libCamera_imx682mipiraw_Flash_Preview_PF", "libCamera_imx682mipiraw_HDR_Scene_Capture", "libCamera_imx682mipiraw_MFSR_Scene_Capture_Zoom1", "libCamera_imx682mipiraw_MFSR_Scene_Capture_Zoom2", "libCamera_imx682mipiraw_Panorama_Capture", "libCamera_imx682mipiraw_Professional_capture", "libCamera_imx682mipiraw_QQ_Capture_ChatMode", "libCamera_imx682mipiraw_Reserved", "libCamera_imx682mipiraw_Scene_Capture", "libCamera_imx682mipiraw_Scene_Capture_64", "libCamera_imx682mipiraw_Scene_Preview", "libCamera_imx682mipiraw_Scene_Preview_Zoom1", "libCamera_imx682mipiraw_Scene_Preview_Zoom2", "libCamera_imx682mipiraw_SuperNS_Face_Preview", "libCamera_imx682mipiraw_SuperNS_Scene_Capture", "libCamera_imx682mipiraw_SuperNS_Scene_Capture_Zoom1", "libCamera_imx682mipiraw_SuperNS_Scene_Capture_Zoom2", "libCamera_imx682mipiraw_SuperNS_Scene_Preview", "libCamera_imx682mipiraw_Torch_Capture", "libCamera_imx682mipiraw_Video", "libCamera_imx682mipiraw_Video_1080P_60fps", "libCamera_imx682mipiraw_Video_1080P_EIS", "libCamera_imx682mipiraw_Video_30fps", "libCamera_imx682mipiraw_Video_480P", "libCamera_imx682mipiraw_Video_4K", "libCamera_imx682mipiraw_Video_4K_Zoom1", "libCamera_imx682mipiraw_Video_4K_Zoom2", "libCamera_imx682mipiraw_Video_60fps", "libCamera_imx682mipiraw_Video_720P", "libCamera_imx682mipiraw_Video_720P_1080P_120fps", "libCamera_imx682mipiraw_Video_720P_240fps", "libCamera_imx682mipiraw_Video_720P_EIS", "libCamera_imx682mipiraw_Video_EIS_Default", "libCamera_imx682mipiraw_Video_Zoom1", "libCamera_imx682mipiraw_Video_Zoom2", "libCamera_imx682mipiraw_Video_zoom", "libCamera_imx682mipiraw_Zoom_capture", "libCamera_imx682mipiraw_portrait_capture_full", "libCamera_imx682mipiraw_portrait_preview_full", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3808,10 +4006,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lbs_hidl_service-impl.so"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libhardware", "libbinder", "libhidlbase", "libhidltransport", "libutils", "vendor.mediatek.hardware.lbs@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3825,10 +4023,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.ae.core.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "lib3a.log", "lib3a.ae", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3842,10 +4040,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.ae.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "lib3a.log", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3859,10 +4057,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.af.core.so"],
+			shared_libs: ["libutils", "libcutils", "lib3a.af", "lib3a.log", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3876,10 +4074,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.af.so"],
+			shared_libs: ["libutils", "libcutils", "lib3a.log", "liblog", "libvpu", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3893,10 +4091,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.awb.core.so"],
+			shared_libs: ["libc++", "liblog", "libcutils", "lib3a.awb", "lib3a.log", "libcamalgo.utility", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3910,10 +4108,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.awb.so"],
+			shared_libs: ["libc++", "liblog", "lib3a.log", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3927,10 +4125,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.ccudrv.so"],
+			shared_libs: ["liblog", "libcutils", "libmtkcam_modulehelper", "libcamalgo.utility", "libion", "libion_mtk", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3944,10 +4142,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.ccuif.so"],
+			shared_libs: ["liblog", "libcutils", "libion", "libion_mtk", "libmtkcam_modulehelper", "libcam.iopipe", "libcamalgo.utility", "lib3a.ae.core", "lib3a.ccudrv", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3961,10 +4159,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.flash.so"],
+			shared_libs: ["liblog", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3978,10 +4176,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.gma.so"],
+			shared_libs: ["libcutils", "lib3a.log", "libcamalgo.utility", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -3995,10 +4193,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.lce.so"],
+			shared_libs: ["libcutils", "lib3a.log", "libcamalgo.utility", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4012,10 +4210,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.log.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4029,10 +4227,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib3a.n3d3a.so"],
+			shared_libs: ["libcutils", "liblog", "lib3a.log", "libutils", "lib3a.awb.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4046,10 +4244,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02k0mipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4063,10 +4261,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02k0mipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4080,10 +4278,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02k0mipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4097,10 +4295,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02m0mipimono_Capture_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4114,10 +4312,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02m0mipimono_Default_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4131,10 +4329,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02m0mipimono_Production_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4148,10 +4346,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02m0mipimono_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4165,10 +4363,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc02m0mipimono_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4182,10 +4380,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc2375hmipiraw19661_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4199,10 +4397,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc2375hmipiraw19661_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4216,10 +4414,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_gc2375hmipiraw19661_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4233,10 +4431,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3HDR_Preivew.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4250,10 +4448,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3rd_Capture_1080P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4267,10 +4465,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3rd_Capture_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4284,10 +4482,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3rd_Capture_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4301,10 +4499,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3rd_Preview_1080P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4318,10 +4516,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3rd_Preview_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4335,10 +4533,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_3rd_Preview_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4352,10 +4550,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_FaceBeauty_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4369,10 +4567,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_FaceBeauty_Capture_Bining.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4386,10 +4584,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_FaceBeauty_Preview_Noface.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4403,10 +4601,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_FaceBeauty_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4420,10 +4618,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_FaceUnlock.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4437,10 +4635,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4454,10 +4652,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Face_Capture_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4471,10 +4669,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4488,10 +4686,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Panorama.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4505,10 +4703,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Production_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4522,10 +4720,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4539,10 +4737,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4556,10 +4754,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Scene_Capture_Bining.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4573,10 +4771,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4590,10 +4788,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_SlowMotion_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4607,10 +4805,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_Video_Recording.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4624,10 +4822,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_WeChatQQ_1080P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4641,10 +4839,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_WeChatQQ_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4658,10 +4856,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_WeChatQQ_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4675,10 +4873,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_YUVHDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4692,10 +4890,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_YUVHDR_Capture_Binning.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4709,10 +4907,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_subject_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4726,10 +4924,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx471mipiraw1_zHDR_Capture_Binning.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4743,10 +4941,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_3rd_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4760,10 +4958,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_3rd_Capture2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4777,10 +4975,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_EIS_Video4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4794,10 +4992,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4811,10 +5009,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Face_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4828,10 +5026,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4845,10 +5043,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4862,10 +5060,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Flash_Preview_PF.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4879,10 +5077,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_HDR_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4896,10 +5094,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_MFSR_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4913,10 +5111,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_MFSR_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4930,10 +5128,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Panorama_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4947,10 +5145,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Professional_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4964,10 +5162,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_QQ_Capture_ChatMode.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4981,10 +5179,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -4998,10 +5196,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5015,10 +5213,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Scene_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5032,10 +5230,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5049,10 +5247,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Scene_Preview_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5066,10 +5264,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Scene_Preview_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5083,10 +5281,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_SuperNS_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5100,10 +5298,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_SuperNS_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5117,10 +5315,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_SuperNS_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5134,10 +5332,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_SuperNS_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5151,10 +5349,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_SuperNS_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5168,10 +5366,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Torch_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5185,10 +5383,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5202,10 +5400,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_1080P_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5219,10 +5417,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_1080P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5236,10 +5434,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_30fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5253,10 +5451,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5270,10 +5468,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5287,10 +5485,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_4K_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5304,10 +5502,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_4K_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5321,10 +5519,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5338,10 +5536,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5355,10 +5553,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_720P_1080P_120fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5372,10 +5570,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_720P_240fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5389,10 +5587,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_720P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5406,10 +5604,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_EIS_Default.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5423,10 +5621,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5440,10 +5638,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5457,10 +5655,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Video_zoom.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5474,10 +5672,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_Zoom_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5491,10 +5689,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_portrait_capture_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5508,10 +5706,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_imx682mipiraw_portrait_preview_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5525,10 +5723,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b10mipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5542,10 +5740,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b10mipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5559,10 +5757,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b10mipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5576,10 +5774,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b1bmipimono_Capture_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5593,10 +5791,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b1bmipimono_Default_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5610,10 +5808,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b1bmipimono_Production_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5627,10 +5825,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b1bmipimono_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5644,10 +5842,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov02b1bmipimono_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5661,10 +5859,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_AutoHDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5678,10 +5876,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_AutoHDR_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5695,10 +5893,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_AutoHDR_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5712,10 +5910,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5729,10 +5927,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Face_Capture_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5746,10 +5944,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5763,10 +5961,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Flash_HDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5780,10 +5978,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_HDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5797,10 +5995,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_HDR_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5814,10 +6012,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_HDR_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5831,10 +6029,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_N3D_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5848,10 +6046,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_N3D_Capture_48M.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5865,10 +6063,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_N3D_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5882,10 +6080,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_N3D_Preview_48M.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5899,10 +6097,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_N3D_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5916,10 +6114,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5933,10 +6131,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5950,10 +6148,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Capture_4cell.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5967,10 +6165,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Capture_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -5984,10 +6182,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6001,10 +6199,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Preview_4k.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6018,10 +6216,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Preview_ZSD_Flash.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6035,10 +6233,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Scene_Preview_ZSD_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6052,10 +6250,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Video_1080.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6069,10 +6267,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_ov8856mipiraw_Video_4k.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6086,10 +6284,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3HDR_Preivew.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6103,10 +6301,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3rd_Capture_1080P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6120,10 +6318,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3rd_Capture_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6137,10 +6335,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3rd_Capture_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6154,10 +6352,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3rd_Preview_1080P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6171,10 +6369,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3rd_Preview_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6188,10 +6386,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_3rd_Preview_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6205,10 +6403,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_FaceBeauty_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6222,10 +6420,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_FaceBeauty_Capture_Bining.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6239,10 +6437,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_FaceBeauty_Preview_Noface.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6256,10 +6454,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_FaceBeauty_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6273,10 +6471,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_FaceUnlock.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6290,10 +6488,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6307,10 +6505,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Face_Capture_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6324,10 +6522,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6341,10 +6539,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Panorama.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6358,10 +6556,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Production_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6375,10 +6573,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6392,10 +6590,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6409,10 +6607,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Scene_Capture_Bining.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6426,10 +6624,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6443,10 +6641,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_SlowMotion_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6460,10 +6658,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_Video_Recording.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6477,10 +6675,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_WeChatQQ_1080P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6494,10 +6692,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_WeChatQQ_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6511,10 +6709,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_WeChatQQ_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6528,10 +6726,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_YUVHDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6545,10 +6743,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_YUVHDR_Capture_Binning.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6562,10 +6760,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5k3p9spmipiraw_zHDR_Capture_Binning.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6579,10 +6777,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_EIS_Video4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6596,10 +6794,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6613,10 +6811,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Face_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6630,10 +6828,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6647,10 +6845,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6664,10 +6862,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Flash_Preview_PF.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6681,10 +6879,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_HDR_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6698,10 +6896,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_MFSR_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6715,10 +6913,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_MFSR_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6732,10 +6930,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Panorama_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6749,10 +6947,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Professional_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6766,10 +6964,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_QQ_Capture_ChatMode.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6783,10 +6981,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_QQ_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6800,10 +6998,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6817,10 +7015,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6834,10 +7032,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Scene_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6851,10 +7049,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6868,10 +7066,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Scene_Preview_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6885,10 +7083,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Scene_Preview_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6902,10 +7100,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_SuperNS_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6919,10 +7117,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_SuperNS_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6936,10 +7134,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_SuperNS_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6953,10 +7151,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_SuperNS_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6970,10 +7168,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_SuperNS_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -6987,10 +7185,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Torch_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7004,10 +7202,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7021,10 +7219,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_1080P_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7038,10 +7236,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_1080P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7055,10 +7253,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_30fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7072,10 +7270,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7089,10 +7287,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7106,10 +7304,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_4K_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7123,10 +7321,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7140,10 +7338,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7157,10 +7355,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_720P_1080P_120fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7174,10 +7372,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_720P_240fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7191,10 +7389,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_720P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7208,10 +7406,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_EIS_Default.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7225,10 +7423,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7242,10 +7440,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7259,10 +7457,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Video_zoom.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7276,10 +7474,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_Zoom_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7293,10 +7491,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_portrait_capture_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7310,10 +7508,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgm1spmipiraw_portrait_preview_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7327,10 +7525,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_EIS_Video4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7344,10 +7542,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7361,10 +7559,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Face_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7378,10 +7576,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7395,10 +7593,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7412,10 +7610,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Flash_Preview_PF.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7429,10 +7627,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_HDR_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7446,10 +7644,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_MFSR_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7463,10 +7661,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_MFSR_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7480,10 +7678,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Panorama_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7497,10 +7695,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Professional_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7514,10 +7712,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_QQ_Capture_ChatMode.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7531,10 +7729,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7548,10 +7746,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7565,10 +7763,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Scene_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7582,10 +7780,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7599,10 +7797,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Scene_Preview_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7616,10 +7814,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Scene_Preview_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7633,10 +7831,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_SuperNS_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7650,10 +7848,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_SuperNS_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7667,10 +7865,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_SuperNS_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7684,10 +7882,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_SuperNS_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7701,10 +7899,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_SuperNS_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7718,10 +7916,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Torch_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7735,10 +7933,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7752,10 +7950,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_1080P_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7769,10 +7967,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_1080P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7786,10 +7984,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_30fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7803,10 +8001,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7820,10 +8018,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7837,10 +8035,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_4K_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7854,10 +8052,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_4K_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7871,10 +8069,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7888,10 +8086,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7905,10 +8103,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_720P_1080P_120fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7922,10 +8120,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_720P_240fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7939,10 +8137,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_720P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7956,10 +8154,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_EIS_Default.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7973,10 +8171,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -7990,10 +8188,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8007,10 +8205,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Video_zoom.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8024,10 +8222,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_Zoom_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8041,10 +8239,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_portrait_capture_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8058,10 +8256,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_s5kgw1mipiraw_portrait_preview_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8075,10 +8273,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_EIS_Video4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8092,10 +8290,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8109,10 +8307,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Face_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8126,10 +8324,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8143,10 +8341,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8160,10 +8358,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Flash_Preview_PF.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8177,10 +8375,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_HDR_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8194,10 +8392,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8211,10 +8409,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8228,10 +8426,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Panorama_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8245,10 +8443,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Professional_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8262,10 +8460,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_QQ_Capture_ChatMode.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8279,10 +8477,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_QQ_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8296,10 +8494,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8313,10 +8511,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8330,10 +8528,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Scene_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8347,10 +8545,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8364,10 +8562,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Scene_Preview_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8381,10 +8579,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Scene_Preview_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8398,10 +8596,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_SuperNS_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8415,10 +8613,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8432,10 +8630,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8449,10 +8647,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8466,10 +8664,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8483,10 +8681,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Torch_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8500,10 +8698,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8517,10 +8715,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_1080P_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8534,10 +8732,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_1080P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8551,10 +8749,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_30fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8568,10 +8766,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8585,10 +8783,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8602,10 +8800,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_4K_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8619,10 +8817,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8636,10 +8834,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8653,10 +8851,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_720P_1080P_120fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8670,10 +8868,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_720P_240fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8687,10 +8885,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_720P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8704,10 +8902,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_EIS_Default.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8721,10 +8919,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8738,10 +8936,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8755,10 +8953,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Video_zoom.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8772,10 +8970,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_Zoom_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8789,10 +8987,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_portrait_capture_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8806,10 +9004,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salaaqtechmains5kgm1sp_portrait_preview_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8823,10 +9021,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_AutoHDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8840,10 +9038,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_AutoHDR_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8857,10 +9055,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_AutoHDR_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8874,10 +9072,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8891,10 +9089,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Face_Capture_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8908,10 +9106,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8925,10 +9123,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Flash_HDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8942,10 +9140,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_HDR_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8959,10 +9157,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_HDR_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8976,10 +9174,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_HDR_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -8993,10 +9191,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_N3D_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9010,10 +9208,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_N3D_Capture_48M.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9027,10 +9225,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_N3D_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9044,10 +9242,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_N3D_Preview_48M.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9061,10 +9259,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_N3D_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9078,10 +9276,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9095,10 +9293,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9112,10 +9310,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Capture_4cell.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9129,10 +9327,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Capture_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9146,10 +9344,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9163,10 +9361,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Preview_4k.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9180,10 +9378,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Preview_ZSD_Flash.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9197,10 +9395,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Scene_Preview_ZSD_superNS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9214,10 +9412,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Video_1080.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9231,10 +9429,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_salawideov8856_Video_4k.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9248,10 +9446,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_EIS_Video4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9265,10 +9463,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Face_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9282,10 +9480,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Face_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9299,10 +9497,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9316,10 +9514,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Flash_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9333,10 +9531,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Flash_Preview_PF.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9350,10 +9548,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_HDR_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9367,10 +9565,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9384,10 +9582,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9401,10 +9599,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Panorama_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9418,10 +9616,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Professional_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9435,10 +9633,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_QQ_Capture_ChatMode.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9452,10 +9650,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Reserved.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9469,10 +9667,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9486,10 +9684,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Scene_Capture_64.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9503,10 +9701,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9520,10 +9718,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Scene_Preview_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9537,10 +9735,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Scene_Preview_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9554,10 +9752,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_SuperNS_Face_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9571,10 +9769,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9588,10 +9786,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9605,10 +9803,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9622,10 +9820,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Preview.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9639,10 +9837,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Torch_Capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9656,10 +9854,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9673,10 +9871,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_1080P_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9690,10 +9888,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_1080P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9707,10 +9905,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_30fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9724,10 +9922,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_480P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9741,10 +9939,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_4K.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9758,10 +9956,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_4K_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9775,10 +9973,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_4K_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9792,10 +9990,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_60fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9809,10 +10007,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_720P.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9826,10 +10024,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_720P_1080P_120fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9843,10 +10041,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_720P_240fps.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9860,10 +10058,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_720P_EIS.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9877,10 +10075,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_EIS_Default.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9894,10 +10092,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_Zoom1.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9911,10 +10109,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_Zoom2.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9928,10 +10126,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Video_zoom.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9945,10 +10143,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_Zoom_capture.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9962,10 +10160,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_portrait_capture_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9979,10 +10177,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libCamera_sarterqtechmains5kgm1sp_portrait_preview_full.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -9996,10 +10194,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libFaceBeautyCap.so"],
+			shared_libs: ["liblog", "libGLESv3", "libEGL", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10013,27 +10211,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libFaceBeautyPre.so"],
+			shared_libs: ["liblog", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libJpgEncPipe",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libJpgEncPipe.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10047,10 +10228,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libMcClient.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10064,10 +10245,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libPerfectlyClearCrux.so"],
+			shared_libs: ["liblog", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10081,10 +10262,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libPolarrRender.so"],
+			shared_libs: ["libGLESv3", "liblog", "libEGL", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10098,10 +10279,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX230PdafLibrary.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10115,10 +10296,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX230PdafLibraryWrapper.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libcam.hal3a.log", "libSonyIMX230PdafLibrary", "lib3a.af.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10132,10 +10313,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX338PdafLibrary.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10149,10 +10330,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX338PdafLibraryWrapper.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libcam.hal3a.log", "libSonyIMX338PdafLibrary", "lib3a.af.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10166,10 +10347,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX386PdafLibrary.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10183,10 +10364,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX386PdafLibraryWrapper.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libcam.hal3a.log", "libSonyIMX386PdafLibrary", "lib3a.af.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10200,10 +10381,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX519PdafLibrary.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10217,10 +10398,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libSonyIMX519PdafLibraryWrapper.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libcam.hal3a.log", "libSonyIMX519PdafLibrary", "lib3a.af.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10234,10 +10415,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libVDBlurless.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10251,10 +10432,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libVDPostureDetection.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10268,10 +10449,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libVDSuperPhotoAPI.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10285,10 +10466,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libWaterMark.so"],
+			shared_libs: ["liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10302,10 +10483,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/lib_bsscore.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libladder", "libnativewindow", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libcam.iopipe", "libdpframework", "libgralloc_extra", "libcameracustom", "libmtkcam_tuning_utils", "libmtkcam_metadata", "libmtkcam_scenariorecorder", "libcamalgo.dngop", "libmtkcam_debugutils", "lib3a.ae.core", "lib3a.af.core", "lib3a.flash", "libmtkcam_hwutils", "libhidlbase", "vendor.mediatek.hardware.power@2.0", "libmfllcore", "libcamalgo.mfnr", "libcamalgo.fdft", "libmtkcam_exif", "libfeature.stereo.provider", "lib3a.awb.core", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10319,10 +10500,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libaal_cust.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10336,44 +10517,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libaal_key.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libaal_mtk",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libaal_mtk.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libaalservice",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libaalservice.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10387,10 +10534,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libakm.so"],
+			shared_libs: ["liblog", "libutils", "libstagefright_foundation", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10404,10 +10551,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libapusys.so"],
+			shared_libs: ["libbase", "libion", "libion_mtk", "liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10421,10 +10568,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_distortion_correction.so"],
+			shared_libs: ["libOpenCL", "libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10438,10 +10585,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_bokeh_api.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10455,10 +10602,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus_left.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10472,10 +10619,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus_preview.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10489,10 +10636,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_dualcam_refocus_right.so"],
+			shared_libs: ["libmpbase", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10506,10 +10653,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_hdr_couple_api.so"],
+			shared_libs: ["libmpbase", "libarcsoft_smart_denoise", "libarcsoft_high_dynamic_range_couple", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10523,10 +10670,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_hdr_denoise_api.so"],
+			shared_libs: ["liblog", "libarcsoft_high_dynamic_range", "libarcsoft_smart_denoise", "libmpbase", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10540,10 +10687,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_high_dynamic_range.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10557,10 +10704,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_high_dynamic_range_couple.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10574,10 +10721,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_lensstaindetection.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10591,10 +10738,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_low_light_hdr.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10608,10 +10755,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_relighting_pro_image.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10625,10 +10772,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_scbokeh_image.so"],
+			shared_libs: ["libmpbase", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10642,10 +10789,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_smart_denoise.so"],
+			shared_libs: ["libmpbase", "liblog", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10659,10 +10806,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_supervideostabilization.so"],
+			shared_libs: ["libmpbase", "libsensorndkbridge", "libEGL", "libGLESv3", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10676,10 +10823,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarcsoft_videostabilizer.so"],
+			shared_libs: ["libmpbase", "libsensorndkbridge", "libEGL", "libGLESv3", "libOpenCL", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10693,10 +10840,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarmnn.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcmdl", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10710,10 +10857,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libarmnn_ndk.mtk.so"],
+			shared_libs: ["liblog", "libcmdl_ndk.mtk", "libdl", "libm", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10727,10 +10874,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbluetooth_audio_session_mediatek.so"],
+			shared_libs: ["vendor.mediatek.hardware.bluetooth.audio@2.1", "libbase", "libcutils", "libfmq", "libhidlbase", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10744,10 +10891,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbluetooth_hw_test.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10761,10 +10908,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbluetooth_mtk.so"],
+			shared_libs: ["liblog", "libcutils", "libnvram", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10778,10 +10925,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbluetooth_mtk_pure.so"],
+			shared_libs: ["liblog", "libcutils", "libnvram", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10795,10 +10942,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbluetooth_relayer.so"],
+			shared_libs: ["liblog", "libcutils", "libbluetoothem_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10812,10 +10959,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbluetoothem_mtk.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10829,10 +10976,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libbt-vendor.so"],
+			shared_libs: ["liblog", "libbluetooth_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10846,10 +10993,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.feature_utils.so"],
+			shared_libs: ["lib3a.af.core", "lib3a.flash", "libcutils", "libutils", "liblog", "libhardware", "libmtkcam_ulog", "lib3a.awb.core", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_metastore", "libdpframework", "libcam.iopipe", "libmtkcam_exif", "libmtkcam_modulehelper", "libmtkcam_tuning_utils", "lib3a.ae.core", "libcameracustom", "libmtkcam_mapping_mgr", "libaedv", "libdip_postproc", "libcam.halsensor", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10863,10 +11010,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.cctsvr.so"],
+			shared_libs: ["libmtkcam_ulog", "liblog", "libutils", "libcutils", "libc++", "libhardware", "libbinder", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_fwkutils", "libmtkcam_metadata", "libcam.iopipe", "libcamdrv_imem", "libcam.hal3a.v3", "libcam.hal3a.v3.nvram.50", "libcam.hal3a.v3.lsctbl.50", "libcam.hal3a.v3.lscMgr", "libcamalgo.lsc", "lib3a.flash", "lib3a.awb.core", "lib3a.af.core", "lib3a.ae.core", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10880,10 +11027,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.log.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10897,10 +11044,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.v3.dng.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcam.hal3a.v3.nvram.50", "libcam.hal3a.v3.lsctbl.50", "libmtkcam_modulehelper", "libmtkcam_metadata", "libmtkcam_stdutils", "lib3a.flash", "lib3a.awb.core", "lib3a.ae.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10914,10 +11061,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.v3.lscMgr.so"],
+			shared_libs: ["libmtkcam_ulog", "liblog", "libutils", "libcutils", "lib3a.awb.core", "libcamalgo.ispfeature", "libcam.hal3a.v3.lsctbl.50", "libcam.hal3a.v3.nvram.50", "libmtkcam_stdutils", "libcameracustom", "libmtkcam_imgbuf", "libmtkcam_modulehelper", "libfeatureiodrv_mem", "libmtkcam_tuning_utils", "libmtkcam_mapping_mgr", "lib3a.flash", "libaedv", "lib3a.af.core", "lib3a.ae.core", "libcamalgo.lsc", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10931,10 +11078,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.v3.lsctbl.50.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcamalgo.lsc", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10948,10 +11095,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.v3.nvram.50.so"],
+			shared_libs: ["libmtkcam_ulog", "liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_modulehelper", "libbinder", "lib3a.flash", "libfeatureiodrv_mem", "libaedv", "libcameracustom", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10965,10 +11112,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.hal3a.v3.so"],
+			shared_libs: ["lib3a.ccudrv", "lib3a.ccuif", "libion", "libion_mtk", "lib3a.n3d3a", "libfeatureiodrv_mem", "libcamalgo.ispfeature", "libcamalgo.utility", "liblog", "libmtkcam_ulog", "libutils", "libcutils", "libladder", "lib3a.awb.core", "lib3a.flash", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_hwutils", "lib3a.gma", "lib3a.lce", "libcamalgo.lsc", "libcamalgo.flicker", "libcamalgo.fdft", "libcam3a_imem", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_sysutils", "libcam.pdtblgen", "libcam.iopipe", "libcam.hal3a.v3.nvram.50", "libcam.hal3a.v3.lsctbl.50", "libcam.hal3a.v3.lscMgr", "libcamdrv_tuning_mgr", "libcam.utils.sensorprovider", "libui", "libhidlbase", "libhidltransport", "libhwbinder", "android.hardware.power@1.0", "vendor.mediatek.hardware.power@2.0", "vendor.mediatek.hardware.mtkpower@1.0", "libcamalgo.vpunr", "lib3a.ae.core", "libaedv", "libmtkcam_tuning_utils", "libmtkcam_mapping_mgr", "libmtkcam.atmseventmgr", "libcameracustom", "lib3a.af.core", "lib3a.af", "lib3a.awb", "lib3a.ae", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10982,10 +11129,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.halisp.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_sysutils", "libmtkcam_hwutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -10999,10 +11146,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.halsensor.so"],
+			shared_libs: ["libshim_utils", "liblog", "libcutils", "libutils", "libcameracustom", "libc++", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_metadata", "libcamdrv_isp", "libmtkcam_ulog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11016,10 +11163,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.iopipe.so"],
+			shared_libs: ["libaedv", "liblog", "libutils", "libcutils", "libimageio_plat_drv", "libimageio_plat_pipe", "libdip_postproc", "libmtkcam_tuning_utils", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_metadata", "libcam.halsensor", "libimageio", "libcamdrv_isp", "libcamdrv_imem", "libhardware", "libdpframework", "libJpgEncPipe", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11033,10 +11180,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.lcs.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "lib3a.awb.core", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "lib3a.flash", "lib3a.af.core", "lib3a.ae.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11050,10 +11197,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.pdtblgen.so"],
+			shared_libs: ["libmtkcam_stdutils", "libmtkcam_imgbuf", "libcam.iopipe", "libmtkcam_modulehelper", "liblog", "libcutils", "libutils", "libhardware", "lib3a.af.core", "libcameracustom", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11067,10 +11214,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.utils.sensorprovider.so"],
+			shared_libs: ["libshim_sensors", "liblog", "libmtkcam_ulog", "libutils", "libcutils", "libmtkcam_stdutils", "android.frameworks.sensorservice@1.0", "android.hardware.sensors@1.0", "libhidlbase", "libhidltransport", "libsensorndkbridge", "libhardware", "libmtkcam_modulehelper", "libcamalgo.gyro", "libmtkcam_imgbuf", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11084,10 +11231,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam.vhdr.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_modulehelper", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_stdutils", "libmtkcam_sysutils", "libmtkcam_ulog", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11101,10 +11248,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcam3a_imem.so"],
+			shared_libs: ["liblog", "libcutils", "libion", "libion_mtk", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11118,10 +11265,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.3dnr.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11135,10 +11282,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.asd.so"],
+			shared_libs: ["libmtk_drvb", "libc++", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11152,10 +11299,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.dngop.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11169,10 +11316,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.eis.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libGLESv2", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11186,10 +11333,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.fdft.so"],
+			shared_libs: ["libcamalgo.utility", "libmtk_drvb", "libc++", "libGLESv2", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11203,10 +11350,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.flicker.so"],
+			shared_libs: ["libcamalgo.utility", "liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11220,10 +11367,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.fsc.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11237,10 +11384,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.gyro.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11254,10 +11401,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.ispfeature.so"],
+			shared_libs: ["liblog", "libcutils", "libhardware", "libutils", "libcamalgo.utility", "lib3a.awb.core", "lib3a.flash", "lib3a.af.core", "lib3a.ae.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11271,10 +11418,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.lmv.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libGLESv2", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11288,10 +11435,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.lsc.so"],
+			shared_libs: ["liblog", "libcutils", "libmtk_drvb", "libcamalgo.utility", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11305,10 +11452,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.mfnr.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "libc++", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11322,10 +11469,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.n3d.so"],
+			shared_libs: ["libmtk_drvb", "libc++", "liblog", "libnativewindow", "libEGL", "libGLESv2", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11339,10 +11486,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.utility.so"],
+			shared_libs: ["liblog", "libEGL", "libGLESv2", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11356,10 +11503,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.vpunr.so"],
+			shared_libs: ["libmtk_drvb", "liblog", "libcutils", "libutils", "libcamalgo.utility", "libvpu", "libion", "libion_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11373,10 +11520,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.vsf.so"],
+			shared_libs: ["libmtk_drvb", "libcamalgo.utility", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11390,10 +11537,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamalgo.warp.so"],
+			shared_libs: ["liblog", "libcutils", "libEGL", "libGLESv2", "libgralloc_extra", "libnativewindow", "libcamalgo.utility", "libutils", "libbinder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11407,10 +11554,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamdrv_imem.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libion", "libion_mtk", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11424,10 +11571,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamdrv_isp.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libion", "libion_mtk", "libcamdrv_imem", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11441,10 +11588,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamdrv_tuning_mgr.so"],
+			shared_libs: ["liblog", "libmtkcam_ulog", "libcutils", "libutils", "libc++", "libbinder", "libcamdrv_imem", "libcamdrv_isp", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11458,10 +11605,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamdrv_twin.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libcamdrv_imem", "libaedv", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11475,10 +11622,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcamera_core_hwi.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libmtkcam_metadata", "libocam_common", "libstface_fd_api", "libmpbase", "libPolarrRender", "libEGL", "libGLESv2", "libcrypto", "libcvface_api", "libarcsoft_distortion_correction", "libmtkcam_stdutils", "libarcsoft_lensstaindetection", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11492,10 +11639,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcameracustom.eis.so"],
+			shared_libs: ["libutils", "libcutils", "libmtkcam_stdutils", "libcam.halsensor", "vendor.mediatek.hardware.power@1.1", "libhidlbase", "libhidltransport", "libhwbinder", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11509,10 +11656,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcameracustom.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libaedv", "libcam.hal3a.log", "libmtkcam_stdutils", "libSonyIMX230PdafLibraryWrapper", "libSonyIMX386PdafLibraryWrapper", "libSonyIMX338PdafLibraryWrapper", "libSonyIMX519PdafLibraryWrapper", "imx682_mipi_raw_IdxMgr", "s5kgm1sp_mipi_raw_IdxMgr", "sarter_qtech_main_s5kgm1sp_IdxMgr", "imx471_mipi_raw1_IdxMgr", "ov8856_mipi_raw_IdxMgr", "ov02b10_mipi_raw_IdxMgr", "ov02b1b_mipi_mono_IdxMgr", "s5kgw1_mipi_raw_IdxMgr", "s5k3p9sp_mipi_raw_IdxMgr", "gc2375h_mipi_raw_19661_IdxMgr", "gc02m0_mipi_mono_IdxMgr", "gc02k0_mipi_raw_IdxMgr", "salaa_qtech_main_s5kgm1sp_IdxMgr", "sala_wide_ov8856_IdxMgr", "libmtkcam_modulehelper", "lib3a.ae.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11526,10 +11673,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libchromanr.so"],
+			shared_libs: ["libutils", "libcutils", "libcam.hal3a.v3", "libmtkcam_mapping_mgr", "libmtkcam_stdutils", "libmtkcam_imgbuf", "liblog", "libcameracustom", "libmtkcam_modulehelper", "libcam.iopipe", "libcam.feature_utils", "libmtkcam_metadata", "libmtkcam_tuning_utils", "libmtkcam_exif", "libmtkcam_grallocutils", "libmtkcam_streamutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11543,10 +11690,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcmdl.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11560,10 +11707,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcmdl_ndk.mtk.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11577,10 +11724,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libcvface_api.so"],
+			shared_libs: ["liblog", "libm", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11594,10 +11741,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libdip_drv.so"],
+			shared_libs: ["liblog", "libcutils", "libdip_imem", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11611,10 +11758,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libdip_imem.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libion", "libion_mtk", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11628,10 +11775,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libdip_postproc.so"],
+			shared_libs: ["libutils", "liblog", "libcutils", "libc++", "libaedv", "libdip_drv", "libdip_imem", "libdpframework", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11645,10 +11792,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libeffecthal.base.so"],
+			shared_libs: ["libui", "liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libcameracustom", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11662,10 +11809,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature.face.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libbinder", "libnativewindow", "libmtkcam_metadata", "libmtkcam_metastore", "libeffecthal.base", "libmtkcam_ulog", "libmtkcam_stdutils", "libcameracustom", "libdpframework", "libmtkcam_imgbuf", "libmtkcam_fdvt", "libcamalgo.fdft", "libcamalgo.asd", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11679,10 +11826,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature.stereo.provider.so"],
+			shared_libs: ["libmtkcam_ulog", "liblog", "libcutils", "libutils", "libnativewindow", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libcameracustom", "libmtkcam_metadata", "libgralloc_extra", "libsync", "libmtkcam.logicalmodule", "libfeatureiodrv_mem", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11696,10 +11843,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature.vsdof.hal.so"],
+			shared_libs: ["libcamalgo.n3d", "libcamalgo.vsf", "libmtkcam_ulog", "liblog", "libcutils", "libutils", "libnativewindow", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libnvram", "libcameracustom", "libdpframework", "libmtkcam_metadata", "libmtkcam_metastore", "libgralloc_extra", "libcam.iopipe", "libsync", "libfeature.stereo.provider", "libmtkcam_tuning_utils", "libfeatureiodrv_mem", "libmtkcam_calibration_provider", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11713,10 +11860,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature_3dnr.so"],
+			shared_libs: ["liblog", "libmtkcam_ulog", "libutils", "libcutils", "libhardware", "libmtkcam_sysutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_modulehelper", "libcam.utils.sensorprovider", "libcamalgo.3dnr", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11730,10 +11877,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature_eis.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcamalgo.lmv", "libcamalgo.eis", "libcamalgo.gyro", "libcamalgo.fsc", "libfeature_lmv", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libmtkcam_sysutils", "libnvram", "libcameracustom", "libcam.utils.sensorprovider", "lib3a.ae.core", "libcameracustom.eis", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11747,10 +11894,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature_fsc.so"],
+			shared_libs: ["liblog", "libmtkcam_ulog", "libutils", "libcutils", "libhardware", "libmtkcam_sysutils", "libmtkcam_stdutils", "libmtkcam_metadata", "libcamalgo.fsc", "libcameracustom", "libcameracustom.eis", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11764,10 +11911,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature_lmv.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcamalgo.lmv", "libcamalgo.gyro", "libcamalgo.eis", "libcamalgo.fsc", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libmtkcam_sysutils", "libmtkcam_metadata", "libcameracustom", "libcam.utils.sensorprovider", "libcameracustom.eis", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11781,10 +11928,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeature_rss.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libmtkcam_ulog", "libmtkcam_sysutils", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11798,10 +11945,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libfeatureiodrv_mem.so"],
+			shared_libs: ["liblog", "libcutils", "libutils", "libcam.halsensor", "libcameracustom", "libbinder", "libmtkcam_ulog", "libmtkcam_modulehelper", "lib3a.flash", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11815,10 +11962,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libforkexecwrap.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11832,10 +11979,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libgz_uree.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11849,10 +11996,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libhwm-oppo.so"],
+			shared_libs: ["liblog", "libfile_op", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11866,10 +12013,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libifcutils_mtk.so"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11883,10 +12030,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libimageio.so"],
+			shared_libs: ["liblog", "libcutils", "libc++", "libimageio_plat_drv", "libimageio_plat_pipe", "libaedv", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11900,10 +12047,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libimageio_plat_drv.so"],
+			shared_libs: ["libcamdrv_tuning_mgr", "liblog", "libcutils", "libc++", "libdpframework", "libutils", "libcamdrv_isp", "libcamdrv_imem", "libcamdrv_twin", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11917,44 +12064,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libimageio_plat_pipe.so"],
+			shared_libs: ["libutils", "liblog", "libcutils", "libc++", "libaedv", "libimageio_plat_drv", "libcamdrv_isp", "libmtkcam_stdutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libjpeg-alpha-oal_vendor",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libjpeg-alpha-oal_vendor.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libjpeg-alpha_vendor",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libjpeg-alpha_vendor.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11968,10 +12081,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libkmsetkey.so"],
+			shared_libs: ["liblog", "libutils", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.keymaster_attestation@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -11985,10 +12098,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libksensor.so"],
+			shared_libs: ["liblog", "libc++", "libdl", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12002,10 +12115,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/liblpcnr.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12019,10 +12132,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmfllcore.so"],
+			shared_libs: ["libutils", "libcutils", "libmtkcam_stdutils", "liblog", "libmtkcam_ulog", "libmtkcam_tuning_utils", "libcameracustom", "libmtkcam_imgbuf", "libcamalgo.mfnr", "libcam.iopipe", "libmtkcam_metadata", "libmtkcam_modulehelper", "libmtkcam_mfb", "libdpframework", "libmtkcam_mapping_mgr", "libaedv", "libladder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12036,10 +12149,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libml_util.so"],
+			shared_libs: ["liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12053,10 +12166,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmpbase.so"],
+			shared_libs: ["libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12070,10 +12183,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmsnr.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12087,10 +12200,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtk-ril.so"],
+			shared_libs: ["libmtkutils", "librilfusion", "libmtknetutils", "libratconfig", "libmtksysutils", "libmtkhardware_legacy", "libsysenv", "libmtkrilutils", "libcrypto", "libmtkcutils", "libmtkproperty", "libmtkrillog", "libmtkconfigutils", "libmtktinyxml", "libmtkares", "libnvram", "libaedv", "libbinder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12104,10 +12217,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.atmseventmgr.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12121,10 +12234,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.eventcallback.so"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libmtkcam_stdutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12138,10 +12251,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.featurepipe.capture.so"],
+			shared_libs: ["libcamalgo.fdft", "lib3a.af.core", "lib3a.flash", "liblog", "libutils", "libcutils", "libladder", "libnativewindow", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libcam.iopipe", "libdpframework", "libgralloc_extra", "libcameracustom", "libmtkcam_tuning_utils", "libmtkcam_metadata", "libcam.feature_utils", "libmtkcam_scenariorecorder", "libcamalgo.dngop", "libmtkcam_debugutils", "lib3a.ae.core", "libmtkcam_hwutils", "libfeature.face", "libhidlbase", "vendor.mediatek.hardware.power@2.0", "libmfllcore", "lib_bsscore", "libcamalgo.mfnr", "libmtkcam_exif", "libmtkcam.featurepipe.vsdof_util", "libmtkcam_metastore", "libmtkcam_3rdparty", "libmtkcam_3rdparty.core", "libmtkcam_mapping_mgr", "libfeature.stereo.provider", "lib3a.awb.core", "libaedv", "libmsnr", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12155,10 +12268,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.featurepipe.depthmap.so"],
+			shared_libs: ["liblog", "libnativewindow", "libutils", "libcutils", "libmtkcam_modulehelper", "libcam.iopipe", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libfeature.vsdof.hal", "libcamalgo.fdft", "libfeature.stereo.provider", "libeffecthal.base", "libgralloc_extra", "libfeature.face", "libmtkcam_metadata", "libmtkcam.featurepipe.vsdof_util", "libcameracustom", "libmtkcam_dpe", "libmtkcam_owe", "libfeature_3dnr", "libJpgEncPipe", "libmtkcam_exif", "libsync", "libdpframework", "libion", "libion_mtk", "libmtkcam_tuning_utils", "libaedv", "libcam.feature_utils", "libladder", "libfeatureiodrv_mem", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12172,10 +12285,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.featurepipe.streaming.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libladder", "libnativewindow", "libcamalgo.warp", "libcamalgo.fsc", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libcam.iopipe", "libmtkcam_rsc", "libdpframework", "libgralloc_extra", "libfeature.face", "libcameracustom", "libfeature_3dnr", "libfeature_fsc", "libmtkcam_tuning_utils", "libcam.feature_utils", "libmtkcam_3rdparty", "libmtkcam_3rdparty.core", "libcamalgo.lmv", "libcamalgo.gyro", "libcamalgo.eis", "libWaterMark", "libmtkcam_scenariorecorder", "libfeature.vsdof.hal", "libfeature_eis", "libcameracustom.eis", "libmtkcam.featurepipe.depthmap", "libmtkcam.featurepipe.vsdof_util", "libJpgEncPipe", "libmtkcam_exif", "libmtkcam_metadata", "libcamalgo.fdft", "libfeature.stereo.provider", "libhardware", "libion", "libmtkcam_debugutils", "libcam.utils.sensorprovider", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12189,10 +12302,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.featurepipe.vsdof_util.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_modulehelper", "libmtkcam_ulog", "libgralloc_extra", "libeffecthal.base", "libcam.iopipe", "libion", "libion_mtk", "libdpframework", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12206,10 +12319,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam.logicalmodule.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_modulehelper", "libmtkcam_metadata", "libmtkcam_ulog", "libmtkcam_stdutils", "libcameracustom", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12223,10 +12336,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_3rdparty.core.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_stdutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12240,10 +12353,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_3rdparty.customer.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_ulog", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_stdutils", "libmtkcam_3rdparty.core", "libcameracustom", "libocam_common", "libcamera_core_hwi", "liboppo_platform_hwi", "libmpbase", "libmtkcam_tuning_utils", "libmtkcam_metastore", "libmtkcam_hwutils", "libcam.feature_utils", "libcvface_api", "libcam.utils.sensorprovider", "libmtkcam_sysutils", "libnativewindow", "libui", "libhidlbase", "libhidltransport", "android.frameworks.sensorservice@1.0", "liboppo_arcSoftBokehEngine_new", "libarcsoft_dualcam_bokeh_api", "libarcsoft_dualcam_refocus_left", "libarcsoft_dualcam_refocus_preview", "libarcsoft_dualcam_refocus_right", "libcam.iopipe", "libfeature.stereo.provider", "libmtkcam_modulehelper", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12257,10 +12370,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_3rdparty.mtk.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_ulog", "libmtkcam_stdutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmfllcore", "libcam.hal3a.v3", "libcam.feature_utils", "libmtkcam_modulehelper", "libmtkcam_hwutils", "libmtkcam_exif", "libcamalgo.fdft", "libcamalgo.dngop", "libmtkcam_imgbuf", "libmtkcam_3rdparty.core", "libmtkcam_scenariorecorder", "libmtkcam_tuning_utils", "libcam.iopipe", "libmtkcam_mapping_mgr", "libcameracustom", "libdpframework", "libmtkcam.featurepipe.vsdof_util", "libfeature.stereo.provider", "liblpcnr", "libmtkcam.featurepipe.depthmap", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12274,10 +12387,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_3rdparty.so"],
+			shared_libs: ["libmtkcam_3rdparty.core", "libmtkcam_3rdparty.mtk", "libmtkcam_3rdparty.customer", "liblog", "libutils", "libcutils", "libmtkcam_ulog", "libmtkcam_stdutils", "libmtkcam_metadata", "libmfllcore", "libcam.hal3a.v3", "libcam.feature_utils", "libmtkcam_modulehelper", "libmtkcam_hwutils", "libcamalgo.dngop", "libmtkcam_imgbuf", "libmtkcam_tuning_utils", "libcam.iopipe", "libmtkcam_mapping_mgr", "libcameracustom", "libdpframework", "libmtkcam.featurepipe.vsdof_util", "libfeature.stereo.provider", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12291,10 +12404,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_calibration_convertor.so"],
+			shared_libs: ["libmtkcam_stdutils", "libmtkcam_modulehelper", "liblog", "libutils", "libcutils", "liboppo_arcSoftBokehEngine_new", "libarcsoft_dualcam_bokeh_api", "libarcsoft_dualcam_refocus_left", "libarcsoft_dualcam_refocus_preview", "libarcsoft_dualcam_refocus_right", "libmtkcam_hwutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12308,10 +12421,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_calibration_provider.so"],
+			shared_libs: ["libfeatureiodrv_mem", "libmtkcam_ulog", "liblog", "libutils", "libcutils", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libcameracustom", "libmtkcam_calibration_convertor", "libfeature.stereo.provider", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12325,10 +12438,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_debugutils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libladder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12342,10 +12455,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_device3_app.so"],
+			shared_libs: ["libmtkcam_device3_utils", "liblog", "libutils", "libcutils", "libcamera_metadata", "libmtkcam_stdutils", "libmtkcam_ulog", "libmtkcam_metadata", "libmtkcam_debugutils", "libmtkcam_grallocutils", "libmtkcam_imgbuf", "libmtkcam_streamutils", "libnativewindow", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_hwutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12359,10 +12472,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_device3_hal.so"],
+			shared_libs: ["libmtkcam_device3_utils", "liblog", "libutils", "libcutils", "libladder", "libcamera_metadata", "libmtkcam_sysutils", "libmtkcam_stdutils", "libmtkcam_ulog", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_device3_app", "libmtkcam_devicesessionpolicy", "libmtkcam_pipelinemodel", "libmtkcam_hwutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12376,10 +12489,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_device3_hidl.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libhidlbase", "libhidltransport", "libfmq", "android.hardware.camera.device@3.2", "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", "android.hardware.camera.device@3.5", "android.hardware.camera.device@3.6", "libcamera_metadata", "libmtkcam_metadata", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_ulog", "libmtkcam_device3_hal", "libmtkcam_device3_hidlutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12393,10 +12506,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_device3_hidlutils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libhidlbase", "libhidltransport", "libfmq", "android.hardware.camera.device@3.2", "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", "android.hardware.camera.device@3.5", "android.hardware.camera.device@3.6", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_grallocutils", "libmtkcam_hwutils", "libmtkcam_sysutils", "libmtkcam_metadata", "libmtkcam_modulehelper", "libmtkcam_streamutils", "libcamera_metadata", "libmtkcam_ulog", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12410,10 +12523,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_device3_utils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libsync", "libcamera_metadata", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_grallocutils", "libmtkcam_hwutils", "libmtkcam_sysutils", "libmtkcam_metadata", "libmtkcam_modulehelper", "libmtkcam_streamutils", "android.hardware.graphics.common@1.2", "vendor.mediatek.hardware.gpu@1.0", "libmtkcam_ulog", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12427,10 +12540,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_devicesessionpolicy.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libcamera_metadata", "libmtkcam_imgbuf", "libmtkcam_stdutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_ulog", "libmtkcam_device3_utils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12444,10 +12557,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_diputils.so"],
+			shared_libs: ["liblog", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12461,10 +12574,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_dpe.so"],
+			shared_libs: ["libcutils", "liblog", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12478,10 +12591,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_exif.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_modulehelper", "libmtkcam_metadata", "libmtkcam_stdutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12495,10 +12608,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_fdvt.so"],
+			shared_libs: ["libcutils", "liblog", "libdip_imem", "libdpframework", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12512,10 +12625,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_featurepolicy.so"],
+			shared_libs: ["libbinder", "liblog", "libhidlbase", "libhidltransport", "vendor.oplus.hardware.orms@1.0", "libormshalclient", "libutils", "libcutils", "libmtkcam_ulog", "libmtkcam_stdutils", "libmtkcam_hwutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_3rdparty", "libmtkcam_3rdparty.core", "libmtkcam_modulehelper", "libmtkcam_exif", "libmtkcam_sysutils", "libmtkcam_scenariorecorder", "libmtkcam_featureutils", "libcameracustom", "libfeature.stereo.provider", "libcameracustom.eis", "libaedv", "libcam.feature_utils", "libcam.vhdr", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12529,10 +12642,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_featureutils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_hwutils", "libmtkcam_modulehelper", "libmtkcam.logicalmodule", "libmtkcam_streamutils", "libfeature.stereo.provider", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12546,10 +12659,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_fwkutils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12563,10 +12676,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_grallocutils.so"],
+			shared_libs: ["libgralloc_extra", "liblog", "libutils", "libsync", "libcutils", "libui", "libmtkcam_stdutils", "libmtkcam_ulog", "libhidlbase", "libhardware", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.allocator@4.0", "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", "vendor.mediatek.hardware.gpu@1.0", "libgralloctypes", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12580,10 +12693,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_hwnode.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libgralloc_extra", "android.hardware.camera.device@3.2", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_ulog", "libmtkcam_grallocutils", "libmtkcam_imgbuf", "libmtkcam_streamutils", "libmtkcam_hwutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_prerelease", "libcam.feature_utils", "libcameracustom", "libcam.utils.sensorprovider", "libcam.iopipe", "libfeature_lmv", "libfeature_3dnr", "libfeature_rss", "libfeature_fsc", "libion_mtk", "libion", "libmtkcam_pipeline", "libfeature_eis", "libcameracustom.eis", "libaedv", "libladder", "libmtkcam_exif", "libstereoinfoaccessor_vsdof", "liboppo_platform_hwi", "libmtkcam_sysutils", "libcam.vhdr", "libmfllcore", "libcamalgo.dngop", "libcamalgo.lmv", "libcamalgo.gyro", "libcamalgo.eis", "libcamalgo.fdft", "libfeature.face", "libcamalgo.fsc", "libdpframework", "libmtkcam_tuning_utils", "libmtkcam_scenariorecorder", "libmtkcam_mapping_mgr", "libmtkcam.featurepipe.streaming", "libmtkcam.featurepipe.capture", "libmtkcam_synchelper", "lib3a.flash", "lib3a.awb.core", "lib3a.af.core", "lib3a.ae.core", "libfeature.stereo.provider", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12597,10 +12710,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_hwutils.so"],
+			shared_libs: ["libfeature.stereo.provider", "liblog", "libmtkcam_ulog", "libutils", "libcutils", "libhardware", "libladder", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_debugutils", "libbwc", "libcameracustom", "libcamalgo.fdft", "libmtkcam_sysutils", "libhidlbase", "libhidltransport", "libhwbinder", "android.hardware.power@1.0", "vendor.mediatek.hardware.mtkpower@1.0", "libcamalgo.mfnr", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12614,10 +12727,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_imgbuf.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libnativewindow", "libion", "libion_mtk", "libaedv", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_grallocutils", "libgralloc_extra", "libmtkcam_sysutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12631,10 +12744,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_mapping_mgr.so"],
+			shared_libs: ["libmtkcam_modulehelper", "liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_grallocutils", "libmtkcam_sysutils", "libutilscallstack", "libaedv", "lib3a.awb.core", "lib3a.af.core", "lib3a.ae.core", "libmtkcam_scenariorecorder", "libcam.hal3a.v3.nvram.50", "lib3a.flash", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12648,10 +12761,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_metadata.so"],
+			shared_libs: ["libaedv", "liblog", "libmtkcam_ulog", "libutils", "libladder", "libcutils", "libhidlbase", "libmtkcam_stdutils", "libcamera_metadata", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12665,10 +12778,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_metastore.so"],
+			shared_libs: ["liblog", "libmtkcam_ulog", "libutils", "libcutils", "libcamera_metadata", "libmtkcam_metadata", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_calibration_convertor", "libmtkcam_calibration_provider", "libfeature.stereo.provider", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12682,10 +12795,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_mfb.so"],
+			shared_libs: ["libcutils", "liblog", "libdip_imem", "libdpframework", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12699,10 +12812,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_modulefactory_aaa.so"],
+			shared_libs: ["liblog", "libutils", "libhardware", "libmtkcam_ulog", "libcam.hal3a.v3", "libcam.hal3a.v3.dng", "libcam.hal3a.v3.lsctbl.50", "libcam.hal3a.v3.nvram.50", "libcam.halisp", "libcam.lcs", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12716,10 +12829,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_modulefactory_custom.so"],
+			shared_libs: ["liblog", "libutils", "libmtkcam_ulog", "libcameracustom", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12733,10 +12846,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_modulefactory_drv.so"],
+			shared_libs: ["liblog", "libutils", "libhardware", "libmtkcam_ulog", "libcam.halsensor", "libcam.iopipe", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12750,10 +12863,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_modulefactory_utils.so"],
+			shared_libs: ["liblog", "libutils", "libhardware", "libmtkcam_ulog", "libmtkcam.logicalmodule", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12767,10 +12880,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_modulehelper.so"],
+			shared_libs: ["liblog", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12784,10 +12897,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_owe.so"],
+			shared_libs: ["libcutils", "liblog", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12801,10 +12914,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipeline.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libaedv", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_ulog", "libmtkcam_metadata", "libmtkcam_streamutils", "libmtkcam_pipeline_fbm", "libmtkcam_prerelease", "libmtkcam_hwutils", "libmtkcam_scenariorecorder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12818,10 +12931,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipeline_fbm.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_debugutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_streamutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12835,10 +12948,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_hwutils", "libmtkcam_featureutils", "libmtkcam_modulehelper", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_pipelinemodel_session", "libmtkcam_pipelinemodel_adapter", "libmtkcam_pipelinemodel_capture", "libmtkcam.logicalmodule", "libfeature.stereo.provider", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12852,10 +12965,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel_adapter.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_modulehelper", "libmtkcam_hwutils", "libmtkcam_featureutils", "libmtkcam_ulog", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12869,10 +12982,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel_capture.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_metadata", "libmtkcam_hwutils", "libmtkcam_streamutils", "libmtkcam_pipeline", "libmtkcam_prerelease", "libmtkcam_sysutils", "libmtkcam_pipelinemodel_utils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12886,10 +12999,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel_isp.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_ulog", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_hwutils", "libmtkcam_sysutils", "libmtkcam_modulehelper", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_3rdparty", "libmtkcam_3rdparty.core", "libmtkcam_streamutils", "libmtkcam_pipeline", "libmtkcam_hwnode", "libcamalgo.fdft", "libdpframework", "libcam.iopipe", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12903,10 +13016,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel_session.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_ulog", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_streamutils", "libmtkcam_hwutils", "libmtkcam_pipeline", "libmtkcam_pipelinepolicy_factory", "libmtkcam_pipelinemodel_utils", "libcameracustom", "libfeature.stereo.provider", "libmtkcam_modulehelper", "libbwc", "libmtkcam_prerelease", "libaedv", "libmtkcam_pipelinemodel_zsl", "libmtkcam_pipelinemodel_capture", "libhidlbase", "vendor.mediatek.hardware.mtkpower@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12920,10 +13033,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel_utils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_hwutils", "libmtkcam_sysutils", "libmtkcam_metadata", "libmtkcam_streamutils", "libmtkcam_pipeline", "libmtkcam_hwnode", "libmtkcam_featureutils", "libbwc", "android.hardware.power@1.0", "vendor.mediatek.hardware.power@2.0", "libcameracustom", "libhardware", "libhidlbase", "libhidltransport", "libfeature.stereo.provider", "libmtkcam_synchelper", "libmtkcam_ulog", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12937,10 +13050,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinemodel_zsl.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_debugutils", "libmtkcam_pipelinemodel_utils", "libmtkcam_pipeline", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_streamutils", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12954,10 +13067,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinepolicy-security.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_hwutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_streamutils", "libmtkcam_pipelinepolicy", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12971,10 +13084,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinepolicy-smvr.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_hwutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_streamutils", "libmtkcam_pipelinepolicy", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -12988,10 +13101,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinepolicy.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_hwutils", "libmtkcam_featureutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_streamutils", "libmtkcam_modulehelper", "libmtkcam_pipelinemodel_utils", "libmtkcam_ulog", "libcameracustom", "libfeature.stereo.provider", "libcameracustom.eis", "libaedv", "libmtkcam_featurepolicy", "libmtkcam_3rdparty", "libmtkcam_3rdparty.core", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13005,10 +13118,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_pipelinepolicy_factory.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_metadata", "libmtkcam_metastore", "libmtkcam_modulehelper", "libmtkcam_featurepolicy", "libmtkcam_pipelinepolicy", "libmtkcam_pipelinepolicy-smvr", "libmtkcam_pipelinepolicy-security", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13022,10 +13135,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_prerelease.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libaedv", "libmtkcam_metadata", "libmtkcam_stdutils", "libmtkcam.eventcallback", "libmtkcam_ulog", "libmtkcam_streamutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13039,10 +13152,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_rsc.so"],
+			shared_libs: ["libcutils", "liblog", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13056,10 +13169,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_scenariorecorder.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_debugutils", "libladder", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13073,10 +13186,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_stdutils.so"],
+			shared_libs: ["liblog", "libutils-v30", "libcutils", "libsync", "libladder", "libmtkcam_ulog", "libaedv", "libhidlbase", "android.hidl.allocator@1.0", "android.hardware.graphics.mapper@2.0", "android.hidl.memory@1.0", "libhidlmemory", "libhidltransport", "android.hardware.camera.common@1.0", "vendor.mediatek.hardware.camera.camdump@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13090,10 +13203,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_streamutils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_ulog", "libmtkcam_debugutils", "lib_bsscore", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13107,10 +13220,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_synchelper.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libhardware", "libmtkcam_stdutils", "libmtkcam_imgbuf", "libmtkcam_metadata", "libmtkcam_ulog", "libmtkcam_metastore", "libmtkcam.logicalmodule", "libmtkcam_modulehelper", "libmtkcam_hwutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13124,10 +13237,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_sysutils.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libsync", "libmtkcam_stdutils", "libhidlbase", "libhidltransport", "libhwbinder", "android.hardware.power@1.0", "vendor.mediatek.hardware.mtkpower@1.0", "libladder", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13141,10 +13254,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_tuning_utils.so"],
+			shared_libs: ["libmtkcam_modulehelper", "libmtkcam_metadata", "liblog", "libmtkcam_stdutils", "libutils", "libmtkcam_sysutils", "libcutils", "libhardware", "libmtkcam_ulog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13158,10 +13271,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkcam_ulog.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libladder", "libaedv", "libmtkcam_debugutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13175,10 +13288,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkconfig.so"],
+			shared_libs: ["libmtkrillog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13192,10 +13305,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkconfigutils.so"],
+			shared_libs: ["libmtkconfig", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13209,10 +13322,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkisp_metadata.so"],
+			shared_libs: ["liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13226,10 +13339,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkrilutils.so"],
+			shared_libs: ["libmtkcutils", "libmtkrillog", "libmtkproperty", "libratconfig", "libmtkconfigutils", "libcrypto", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13243,10 +13356,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtktinyxml.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13260,10 +13373,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libmtkutils.so"],
+			shared_libs: ["libmtkcutils", "libmtkproperty", "libmtkrillog", "libladder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13277,10 +13390,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libneuroeara.so"],
+			shared_libs: ["libbase", "libcutils", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13311,10 +13424,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libneuron_platform.so"],
+			shared_libs: ["libbase", "libutils", "liblog", "libion", "libion_mtk", "libcutils", "libvpu", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13328,10 +13441,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libneuron_runtime.so"],
+			shared_libs: ["libdl", "liblog", "libz", "libneuron_platform", "libion", "libion_mtk", "libvpu", "libm", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13345,10 +13458,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libneuropilot_hal_utils.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13362,10 +13475,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libneuropilot_jni_R.so"],
+			shared_libs: ["libnativewindow", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13379,10 +13492,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnir_neon_driver.so"],
+			shared_libs: ["libbase", "liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13396,10 +13509,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnir_neon_driver_ndk.mtk.so"],
+			shared_libs: ["liblog", "libm", "libdl", "libc", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13413,10 +13526,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnxprecord.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13430,10 +13543,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libnxpspeech.so"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13447,10 +13560,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libocam_common.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13464,10 +13577,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/liboppo_aisd.so"],
+			shared_libs: ["libml_util", "libneuralnetworks", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13481,10 +13594,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/liboppo_arcSoftBokehEngine_new.so"],
+			shared_libs: ["liblog", "libutils", "libmtkcam_imgbuf", "libcutils", "libmtkcam_modulehelper", "libmtkcam_stdutils", "libmtkcam_pipeline", "libmtkcam_metadata", "libmtkcam_streamutils", "libarcsoft_dualcam_bokeh_api", "libarcsoft_dualcam_refocus_left", "libarcsoft_dualcam_refocus_preview", "libarcsoft_dualcam_refocus_right", "libmpbase", "libhardware", "libocam_common", "liboppo_platform_hwi", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13498,10 +13611,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/liboppo_blank_algo.so"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13515,10 +13628,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/liboppo_platform_hwi.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libhardware", "libcamera_metadata", "libcamera_core_hwi", "libocam_common", "libarcsoft_distortion_correction", "libmpbase", "libmtkcam_stdutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13532,10 +13645,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libratconfig.so"],
+			shared_libs: ["libmtkutils", "libmtkrillog", "libmtkcutils", "libmtkproperty", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13549,10 +13662,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/librilfusion.so"],
+			shared_libs: ["libmtkrillog", "libmtkcutils", "libmtkhardware_legacy", "libmtkrilutils", "libmtkproperty", "libmtkutils", "libmtkconfigutils", "android.hardware.radio@1.0", "android.hardware.radio@1.1", "android.hardware.radio@1.2", "android.hardware.radio@1.3", "android.hardware.radio@1.4", "android.hardware.radio@1.5", "android.hardware.radio.config@1.0", "android.hardware.radio.config@1.1", "android.hardware.radio.config@1.2", "vendor.mediatek.hardware.mtkradioex@2.0", "vendor.oplus.hardware.radio@1.0", "vendor.oplus.hardware.appradio@1.0", "libbinder", "libhidlbase", "libhidltransport", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13566,10 +13679,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libsensor_custom.so"],
+			shared_libs: ["libhardware", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13583,10 +13696,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libstereoinfoaccessor_vsdof.so"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libexpat", "libz", "libpng", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13600,10 +13713,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libstface_fd_api.so"],
+			shared_libs: ["liblog", "libm", "libc", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13617,10 +13730,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libtflite_mtk.so"],
+			shared_libs: ["liblog", "libcutils", "libtextclassifier_hash", "libnativewindow", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13634,10 +13747,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libtflite_mtk_static_R.so"],
+			shared_libs: ["libnativewindow", "liblog", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13651,10 +13764,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libudf.so"],
+			shared_libs: ["liblog", "libbase", "libunwindstack", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13668,10 +13781,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libwifi-hal-mtk.so"],
+			shared_libs: ["libbase", "libcutils", "liblog", "libnl", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13685,10 +13798,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libwifitest.so"],
+			shared_libs: ["libcutils", "libnvram", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13702,10 +13815,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/mtkcam/libmtkcam_streaminfo_plugin-p1stt.so"],
+			shared_libs: ["liblog", "libutils", "libcutils", "libmtkcam_stdutils", "libmtkcam_hwutils", "libmtkcam_modulehelper", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	relative_install_path: "mtkcam",
 	prefer: true,
 	soc_specific: true,
@@ -13720,10 +13833,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/ov02b10_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13737,10 +13850,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/ov02b10_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_ov02b10mipiraw_Reserved", "libCamera_ov02b10mipiraw_Scene_Capture", "libCamera_ov02b10mipiraw_Scene_Preview", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13754,10 +13867,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/ov02b1b_mipi_mono_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13771,10 +13884,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/ov02b1b_mipi_mono_tuning.so"],
+			shared_libs: ["liblog", "libCamera_ov02b1bmipimono_Capture_Preview", "libCamera_ov02b1bmipimono_Default_Video", "libCamera_ov02b1bmipimono_Production_Capture", "libCamera_ov02b1bmipimono_Reserved", "libCamera_ov02b1bmipimono_Scene_Capture", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13788,10 +13901,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/ov8856_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13805,10 +13918,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/ov8856_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_ov8856mipiraw_AutoHDR_Capture", "libCamera_ov8856mipiraw_AutoHDR_Preview", "libCamera_ov8856mipiraw_AutoHDR_Video", "libCamera_ov8856mipiraw_Face_Capture", "libCamera_ov8856mipiraw_Face_Capture_superNS", "libCamera_ov8856mipiraw_Flash_Capture", "libCamera_ov8856mipiraw_Flash_HDR_Capture", "libCamera_ov8856mipiraw_HDR_Capture", "libCamera_ov8856mipiraw_HDR_Preview", "libCamera_ov8856mipiraw_HDR_Video", "libCamera_ov8856mipiraw_N3D_Capture", "libCamera_ov8856mipiraw_N3D_Capture_48M", "libCamera_ov8856mipiraw_N3D_Preview", "libCamera_ov8856mipiraw_N3D_Preview_48M", "libCamera_ov8856mipiraw_N3D_Video", "libCamera_ov8856mipiraw_Reserved", "libCamera_ov8856mipiraw_Scene_Capture", "libCamera_ov8856mipiraw_Scene_Capture_4cell", "libCamera_ov8856mipiraw_Scene_Capture_superNS", "libCamera_ov8856mipiraw_Scene_Preview", "libCamera_ov8856mipiraw_Scene_Preview_4k", "libCamera_ov8856mipiraw_Scene_Preview_ZSD_Flash", "libCamera_ov8856mipiraw_Scene_Preview_ZSD_superNS", "libCamera_ov8856mipiraw_Video_1080", "libCamera_ov8856mipiraw_Video_4k", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13822,10 +13935,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/s5k3p9sp_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13839,10 +13952,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/s5k3p9sp_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_s5k3p9spmipiraw_3HDR_Preivew", "libCamera_s5k3p9spmipiraw_3rd_Capture_1080P", "libCamera_s5k3p9spmipiraw_3rd_Capture_480P", "libCamera_s5k3p9spmipiraw_3rd_Capture_720P", "libCamera_s5k3p9spmipiraw_3rd_Preview_1080P", "libCamera_s5k3p9spmipiraw_3rd_Preview_480P", "libCamera_s5k3p9spmipiraw_3rd_Preview_720P", "libCamera_s5k3p9spmipiraw_FaceBeauty_Capture", "libCamera_s5k3p9spmipiraw_FaceBeauty_Capture_Bining", "libCamera_s5k3p9spmipiraw_FaceBeauty_Preview_Noface", "libCamera_s5k3p9spmipiraw_FaceBeauty_Scene_Preview", "libCamera_s5k3p9spmipiraw_FaceUnlock", "libCamera_s5k3p9spmipiraw_Face_Capture", "libCamera_s5k3p9spmipiraw_Face_Capture_superNS", "libCamera_s5k3p9spmipiraw_Flash_Capture", "libCamera_s5k3p9spmipiraw_Panorama", "libCamera_s5k3p9spmipiraw_Production_Capture", "libCamera_s5k3p9spmipiraw_Reserved", "libCamera_s5k3p9spmipiraw_Scene_Capture", "libCamera_s5k3p9spmipiraw_Scene_Capture_Bining", "libCamera_s5k3p9spmipiraw_Scene_Preview", "libCamera_s5k3p9spmipiraw_SlowMotion_Video", "libCamera_s5k3p9spmipiraw_Video_Recording", "libCamera_s5k3p9spmipiraw_WeChatQQ_1080P", "libCamera_s5k3p9spmipiraw_WeChatQQ_480P", "libCamera_s5k3p9spmipiraw_WeChatQQ_720P", "libCamera_s5k3p9spmipiraw_YUVHDR_Capture", "libCamera_s5k3p9spmipiraw_YUVHDR_Capture_Binning", "libCamera_s5k3p9spmipiraw_zHDR_Capture_Binning", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13856,10 +13969,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/s5kgm1sp_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13873,10 +13986,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/s5kgm1sp_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_s5kgm1spmipiraw_EIS_Video4K", "libCamera_s5kgm1spmipiraw_Face_Capture", "libCamera_s5kgm1spmipiraw_Face_Capture_64", "libCamera_s5kgm1spmipiraw_Face_Preview", "libCamera_s5kgm1spmipiraw_Flash_Capture", "libCamera_s5kgm1spmipiraw_Flash_Preview_PF", "libCamera_s5kgm1spmipiraw_HDR_Scene_Capture", "libCamera_s5kgm1spmipiraw_MFSR_Scene_Capture_Zoom1", "libCamera_s5kgm1spmipiraw_MFSR_Scene_Capture_Zoom2", "libCamera_s5kgm1spmipiraw_Panorama_Capture", "libCamera_s5kgm1spmipiraw_Professional_capture", "libCamera_s5kgm1spmipiraw_QQ_Capture_ChatMode", "libCamera_s5kgm1spmipiraw_QQ_Preview", "libCamera_s5kgm1spmipiraw_Reserved", "libCamera_s5kgm1spmipiraw_Scene_Capture", "libCamera_s5kgm1spmipiraw_Scene_Capture_64", "libCamera_s5kgm1spmipiraw_Scene_Preview", "libCamera_s5kgm1spmipiraw_Scene_Preview_Zoom1", "libCamera_s5kgm1spmipiraw_Scene_Preview_Zoom2", "libCamera_s5kgm1spmipiraw_SuperNS_Face_Preview", "libCamera_s5kgm1spmipiraw_SuperNS_Scene_Capture", "libCamera_s5kgm1spmipiraw_SuperNS_Scene_Capture_Zoom1", "libCamera_s5kgm1spmipiraw_SuperNS_Scene_Capture_Zoom2", "libCamera_s5kgm1spmipiraw_SuperNS_Scene_Preview", "libCamera_s5kgm1spmipiraw_Torch_Capture", "libCamera_s5kgm1spmipiraw_Video", "libCamera_s5kgm1spmipiraw_Video_1080P_60fps", "libCamera_s5kgm1spmipiraw_Video_1080P_EIS", "libCamera_s5kgm1spmipiraw_Video_30fps", "libCamera_s5kgm1spmipiraw_Video_480P", "libCamera_s5kgm1spmipiraw_Video_4K", "libCamera_s5kgm1spmipiraw_Video_4K_Zoom1", "libCamera_s5kgm1spmipiraw_Video_60fps", "libCamera_s5kgm1spmipiraw_Video_720P", "libCamera_s5kgm1spmipiraw_Video_720P_1080P_120fps", "libCamera_s5kgm1spmipiraw_Video_720P_240fps", "libCamera_s5kgm1spmipiraw_Video_720P_EIS", "libCamera_s5kgm1spmipiraw_Video_EIS_Default", "libCamera_s5kgm1spmipiraw_Video_Zoom1", "libCamera_s5kgm1spmipiraw_Video_Zoom2", "libCamera_s5kgm1spmipiraw_Video_zoom", "libCamera_s5kgm1spmipiraw_Zoom_capture", "libCamera_s5kgm1spmipiraw_portrait_capture_full", "libCamera_s5kgm1spmipiraw_portrait_preview_full", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13890,10 +14003,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/s5kgw1_mipi_raw_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13907,10 +14020,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/s5kgw1_mipi_raw_tuning.so"],
+			shared_libs: ["liblog", "libCamera_s5kgw1mipiraw_EIS_Video4K", "libCamera_s5kgw1mipiraw_Face_Capture", "libCamera_s5kgw1mipiraw_Face_Capture_64", "libCamera_s5kgw1mipiraw_Face_Preview", "libCamera_s5kgw1mipiraw_Flash_Capture", "libCamera_s5kgw1mipiraw_Flash_Preview_PF", "libCamera_s5kgw1mipiraw_HDR_Scene_Capture", "libCamera_s5kgw1mipiraw_MFSR_Scene_Capture_Zoom1", "libCamera_s5kgw1mipiraw_MFSR_Scene_Capture_Zoom2", "libCamera_s5kgw1mipiraw_Panorama_Capture", "libCamera_s5kgw1mipiraw_Professional_capture", "libCamera_s5kgw1mipiraw_QQ_Capture_ChatMode", "libCamera_s5kgw1mipiraw_Reserved", "libCamera_s5kgw1mipiraw_Scene_Capture", "libCamera_s5kgw1mipiraw_Scene_Capture_64", "libCamera_s5kgw1mipiraw_Scene_Preview", "libCamera_s5kgw1mipiraw_Scene_Preview_Zoom1", "libCamera_s5kgw1mipiraw_Scene_Preview_Zoom2", "libCamera_s5kgw1mipiraw_SuperNS_Face_Preview", "libCamera_s5kgw1mipiraw_SuperNS_Scene_Capture", "libCamera_s5kgw1mipiraw_SuperNS_Scene_Capture_Zoom1", "libCamera_s5kgw1mipiraw_SuperNS_Scene_Capture_Zoom2", "libCamera_s5kgw1mipiraw_SuperNS_Scene_Preview", "libCamera_s5kgw1mipiraw_Torch_Capture", "libCamera_s5kgw1mipiraw_Video", "libCamera_s5kgw1mipiraw_Video_1080P_60fps", "libCamera_s5kgw1mipiraw_Video_1080P_EIS", "libCamera_s5kgw1mipiraw_Video_30fps", "libCamera_s5kgw1mipiraw_Video_480P", "libCamera_s5kgw1mipiraw_Video_4K", "libCamera_s5kgw1mipiraw_Video_4K_Zoom1", "libCamera_s5kgw1mipiraw_Video_4K_Zoom2", "libCamera_s5kgw1mipiraw_Video_60fps", "libCamera_s5kgw1mipiraw_Video_720P", "libCamera_s5kgw1mipiraw_Video_720P_1080P_120fps", "libCamera_s5kgw1mipiraw_Video_720P_240fps", "libCamera_s5kgw1mipiraw_Video_720P_EIS", "libCamera_s5kgw1mipiraw_Video_EIS_Default", "libCamera_s5kgw1mipiraw_Video_Zoom1", "libCamera_s5kgw1mipiraw_Video_Zoom2", "libCamera_s5kgw1mipiraw_Video_zoom", "libCamera_s5kgw1mipiraw_Zoom_capture", "libCamera_s5kgw1mipiraw_portrait_capture_full", "libCamera_s5kgw1mipiraw_portrait_preview_full", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13924,10 +14037,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/sala_wide_ov8856_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13941,10 +14054,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/sala_wide_ov8856_tuning.so"],
+			shared_libs: ["liblog", "libCamera_salawideov8856_AutoHDR_Capture", "libCamera_salawideov8856_AutoHDR_Preview", "libCamera_salawideov8856_AutoHDR_Video", "libCamera_salawideov8856_Face_Capture", "libCamera_salawideov8856_Face_Capture_superNS", "libCamera_salawideov8856_Flash_Capture", "libCamera_salawideov8856_Flash_HDR_Capture", "libCamera_salawideov8856_HDR_Capture", "libCamera_salawideov8856_HDR_Preview", "libCamera_salawideov8856_HDR_Video", "libCamera_salawideov8856_N3D_Capture", "libCamera_salawideov8856_N3D_Capture_48M", "libCamera_salawideov8856_N3D_Preview", "libCamera_salawideov8856_N3D_Preview_48M", "libCamera_salawideov8856_N3D_Video", "libCamera_salawideov8856_Reserved", "libCamera_salawideov8856_Scene_Capture", "libCamera_salawideov8856_Scene_Capture_4cell", "libCamera_salawideov8856_Scene_Capture_superNS", "libCamera_salawideov8856_Scene_Preview", "libCamera_salawideov8856_Scene_Preview_4k", "libCamera_salawideov8856_Scene_Preview_ZSD_Flash", "libCamera_salawideov8856_Scene_Preview_ZSD_superNS", "libCamera_salawideov8856_Video_1080", "libCamera_salawideov8856_Video_4k", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13958,10 +14071,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/salaa_qtech_main_s5kgm1sp_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13975,10 +14088,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/salaa_qtech_main_s5kgm1sp_tuning.so"],
+			shared_libs: ["liblog", "libCamera_salaaqtechmains5kgm1sp_EIS_Video4K", "libCamera_salaaqtechmains5kgm1sp_Face_Capture", "libCamera_salaaqtechmains5kgm1sp_Face_Capture_64", "libCamera_salaaqtechmains5kgm1sp_Face_Preview", "libCamera_salaaqtechmains5kgm1sp_Flash_Capture", "libCamera_salaaqtechmains5kgm1sp_Flash_Preview_PF", "libCamera_salaaqtechmains5kgm1sp_HDR_Scene_Capture", "libCamera_salaaqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom1", "libCamera_salaaqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom2", "libCamera_salaaqtechmains5kgm1sp_Panorama_Capture", "libCamera_salaaqtechmains5kgm1sp_Professional_capture", "libCamera_salaaqtechmains5kgm1sp_QQ_Capture_ChatMode", "libCamera_salaaqtechmains5kgm1sp_QQ_Preview", "libCamera_salaaqtechmains5kgm1sp_Reserved", "libCamera_salaaqtechmains5kgm1sp_Scene_Capture", "libCamera_salaaqtechmains5kgm1sp_Scene_Capture_64", "libCamera_salaaqtechmains5kgm1sp_Scene_Preview", "libCamera_salaaqtechmains5kgm1sp_Scene_Preview_Zoom1", "libCamera_salaaqtechmains5kgm1sp_Scene_Preview_Zoom2", "libCamera_salaaqtechmains5kgm1sp_SuperNS_Face_Preview", "libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Capture", "libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom1", "libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom2", "libCamera_salaaqtechmains5kgm1sp_SuperNS_Scene_Preview", "libCamera_salaaqtechmains5kgm1sp_Torch_Capture", "libCamera_salaaqtechmains5kgm1sp_Video", "libCamera_salaaqtechmains5kgm1sp_Video_1080P_60fps", "libCamera_salaaqtechmains5kgm1sp_Video_1080P_EIS", "libCamera_salaaqtechmains5kgm1sp_Video_30fps", "libCamera_salaaqtechmains5kgm1sp_Video_480P", "libCamera_salaaqtechmains5kgm1sp_Video_4K", "libCamera_salaaqtechmains5kgm1sp_Video_4K_Zoom1", "libCamera_salaaqtechmains5kgm1sp_Video_60fps", "libCamera_salaaqtechmains5kgm1sp_Video_720P", "libCamera_salaaqtechmains5kgm1sp_Video_720P_1080P_120fps", "libCamera_salaaqtechmains5kgm1sp_Video_720P_240fps", "libCamera_salaaqtechmains5kgm1sp_Video_720P_EIS", "libCamera_salaaqtechmains5kgm1sp_Video_EIS_Default", "libCamera_salaaqtechmains5kgm1sp_Video_Zoom1", "libCamera_salaaqtechmains5kgm1sp_Video_Zoom2", "libCamera_salaaqtechmains5kgm1sp_Video_zoom", "libCamera_salaaqtechmains5kgm1sp_Zoom_capture", "libCamera_salaaqtechmains5kgm1sp_portrait_capture_full", "libCamera_salaaqtechmains5kgm1sp_portrait_preview_full", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -13992,10 +14105,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/sarter_qtech_main_s5kgm1sp_IdxMgr.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14009,10 +14122,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/sarter_qtech_main_s5kgm1sp_tuning.so"],
+			shared_libs: ["liblog", "libCamera_sarterqtechmains5kgm1sp_EIS_Video4K", "libCamera_sarterqtechmains5kgm1sp_Face_Capture", "libCamera_sarterqtechmains5kgm1sp_Face_Capture_64", "libCamera_sarterqtechmains5kgm1sp_Face_Preview", "libCamera_sarterqtechmains5kgm1sp_Flash_Capture", "libCamera_sarterqtechmains5kgm1sp_Flash_Preview_PF", "libCamera_sarterqtechmains5kgm1sp_HDR_Scene_Capture", "libCamera_sarterqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom1", "libCamera_sarterqtechmains5kgm1sp_MFSR_Scene_Capture_Zoom2", "libCamera_sarterqtechmains5kgm1sp_Panorama_Capture", "libCamera_sarterqtechmains5kgm1sp_Professional_capture", "libCamera_sarterqtechmains5kgm1sp_QQ_Capture_ChatMode", "libCamera_sarterqtechmains5kgm1sp_Reserved", "libCamera_sarterqtechmains5kgm1sp_Scene_Capture", "libCamera_sarterqtechmains5kgm1sp_Scene_Capture_64", "libCamera_sarterqtechmains5kgm1sp_Scene_Preview", "libCamera_sarterqtechmains5kgm1sp_Scene_Preview_Zoom1", "libCamera_sarterqtechmains5kgm1sp_Scene_Preview_Zoom2", "libCamera_sarterqtechmains5kgm1sp_SuperNS_Face_Preview", "libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Capture", "libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom1", "libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Capture_Zoom2", "libCamera_sarterqtechmains5kgm1sp_SuperNS_Scene_Preview", "libCamera_sarterqtechmains5kgm1sp_Torch_Capture", "libCamera_sarterqtechmains5kgm1sp_Video", "libCamera_sarterqtechmains5kgm1sp_Video_1080P_60fps", "libCamera_sarterqtechmains5kgm1sp_Video_1080P_EIS", "libCamera_sarterqtechmains5kgm1sp_Video_30fps", "libCamera_sarterqtechmains5kgm1sp_Video_480P", "libCamera_sarterqtechmains5kgm1sp_Video_4K", "libCamera_sarterqtechmains5kgm1sp_Video_4K_Zoom1", "libCamera_sarterqtechmains5kgm1sp_Video_4K_Zoom2", "libCamera_sarterqtechmains5kgm1sp_Video_60fps", "libCamera_sarterqtechmains5kgm1sp_Video_720P", "libCamera_sarterqtechmains5kgm1sp_Video_720P_1080P_120fps", "libCamera_sarterqtechmains5kgm1sp_Video_720P_240fps", "libCamera_sarterqtechmains5kgm1sp_Video_720P_EIS", "libCamera_sarterqtechmains5kgm1sp_Video_EIS_Default", "libCamera_sarterqtechmains5kgm1sp_Video_Zoom1", "libCamera_sarterqtechmains5kgm1sp_Video_Zoom2", "libCamera_sarterqtechmains5kgm1sp_Video_zoom", "libCamera_sarterqtechmains5kgm1sp_Zoom_capture", "libCamera_sarterqtechmains5kgm1sp_portrait_capture_full", "libCamera_sarterqtechmains5kgm1sp_portrait_preview_full", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14026,10 +14139,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.apuware.utils@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14043,10 +14156,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.apuware.xrp@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14060,10 +14173,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.atci@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14077,10 +14190,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.atms@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14094,10 +14207,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.bgservice@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14111,10 +14224,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.bgservice@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.camera.bgservice@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14128,10 +14241,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.camdump@1.0.so"],
+			shared_libs: ["android.hardware.camera.common@1.0", "android.hardware.camera.device@3.2", "android.hardware.graphics.common@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14145,10 +14258,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.frhandler@1.0.so"],
+			shared_libs: ["android.hardware.camera.common@1.0", "android.hardware.camera.device@3.2", "android.hardware.graphics.common@1.0", "android.hidl.memory@1.0", "vendor.mediatek.hardware.camera.security@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14162,10 +14275,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.isphal@1.0.so"],
+			shared_libs: ["android.hardware.graphics.common@1.0", "android.hardware.graphics.common@1.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14179,10 +14292,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.lomoeffect@1.0.so"],
+			shared_libs: ["android.hardware.camera.common@1.0", "android.hardware.camera.device@3.2", "android.hardware.graphics.common@1.0", "android.hidl.memory@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14196,10 +14309,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.postproc@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14213,10 +14326,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.camera.security@1.0.so"],
+			shared_libs: ["android.hardware.camera.common@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14230,10 +14343,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.dfps@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14247,10 +14360,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.dplanner@2.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14264,10 +14377,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14281,10 +14394,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.engineermode@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14298,10 +14411,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.2.so"],
+			shared_libs: ["vendor.mediatek.hardware.engineermode@1.0", "vendor.mediatek.hardware.engineermode@1.1", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14315,10 +14428,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.3.so"],
+			shared_libs: ["vendor.mediatek.hardware.engineermode@1.0", "vendor.mediatek.hardware.engineermode@1.1", "vendor.mediatek.hardware.engineermode@1.2", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14332,10 +14445,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.keymaster_attestation@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14349,10 +14462,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.keymaster_attestation@1.1.so"],
+			shared_libs: ["vendor.mediatek.hardware.keymaster_attestation@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14366,10 +14479,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.lbs@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14383,10 +14496,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mdmonitor@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14400,10 +14513,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.mtkradioex@2.0.so"],
+			shared_libs: ["android.hardware.radio@1.0", "android.hardware.radio@1.1", "android.hardware.radio@1.2", "android.hardware.radio@1.4", "android.hardware.radio@1.5", "android.hidl.safe_union@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14417,10 +14530,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.power@1.1.so"],
+			shared_libs: ["android.hardware.power@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14434,10 +14547,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.power@2.0.so"],
+			shared_libs: ["android.hardware.power@1.0", "android.hardware.power@1.1", "android.hardware.power@1.2", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14451,16 +14564,17 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.pplagent@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.mediatek.hardware.videotelephony@1.0",
+	name: "vendor.mediatek.hardware.videotelephony@1.0_vendor",
+	stem: "vendor.mediatek.hardware.videotelephony@1.0",
 	owner: "realme",
 	strip: {
 		none: true,
@@ -14468,10 +14582,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.videotelephony@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14485,10 +14599,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.trustonic.tee.tui@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14502,10 +14616,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.trustonic.tee@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14519,10 +14633,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/vendor.trustonic.tee@1.1.so"],
+			shared_libs: ["vendor.trustonic.tee@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
 }
@@ -14536,13 +14650,14 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/system_ext/lib/libem_support_jni.so"],
+			shared_libs: ["libandroid_runtime", "liblog", "libutils", "libgui", "libc++", "libc", "libm", "libdl", ],
 		},
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libem_support_jni.so"],
+			shared_libs: ["libandroid_runtime", "liblog", "libutils", "libgui", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "both",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14556,10 +14671,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libcomutils.so"],
+			shared_libs: ["libcutils", "libstagefright_foundation", "libutils", "libstagefright", "libmedia", "liblog", "libhidlbase", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14590,10 +14705,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libimsma_adapt.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14607,10 +14722,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libimsma_rtp.so"],
+			shared_libs: ["libbinder", "libmedia", "libutils", "libcutils", "libstagefright", "libstagefright_foundation", "libimsma_socketwrapper", "libvcodec_cap", "libimsma_adapt", "liblog", "libsignal", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14624,10 +14739,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libimsma_socketwrapper.so"],
+			shared_libs: ["libbinder", "libmedia", "libutils", "libcutils", "libstagefright", "libstagefright_foundation", "libnetd_client", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14641,10 +14756,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libmtk_vt_service.so"],
+			shared_libs: ["libandroid_runtime", "libbinder", "libutils", "libcutils", "libnativehelper", "libui", "libgui", "libmedia", "libbase", "libfmq", "libbinder_ndk", "vendor.mediatek.hardware.videotelephony@1.0", "vendor.mediatek.hardware.videotelephony-V1-ndk", "libhidlbase", "libhidltransport", "libimsma", "libsource", "libimsma_rtp", "libvt_avsync", "libstagefright_foundation", "libvcodec_cap", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14658,10 +14773,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libmtk_vt_wrapper.so"],
+			shared_libs: ["libandroid_runtime", "libbinder", "libutils", "libcutils", "libnativehelper", "libfmq", "libbinder_ndk", "vendor.mediatek.hardware.videotelephony@1.0", "vendor.mediatek.hardware.videotelephony-V1-ndk", "libhidlbase", "libhidltransport", "libui", "libgui", "libmedia", "libvcodec_cap", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14675,10 +14790,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libsignal.so"],
+			shared_libs: ["libcutils", "libutils", "libstagefright_foundation", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14692,10 +14807,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libsink.so"],
+			shared_libs: ["libbinder", "libcutils", "libgui", "libmedia", "libstagefright", "libstagefright_foundation", "libui", "libutils", "libcomutils", "libvcodec_cap", "libvt_avsync", "liblog", "libmedia_omx", "libaudioclient", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14709,10 +14824,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libsource.so"],
+			shared_libs: ["libshim_ui", "libbinder", "libcutils", "libgui", "libmedia", "libstagefright", "libstagefright_foundation", "libmedia_omx", "libui", "libutils", "libcamera_client", "libcomutils", "libvcodec_cap", "liblog", "libsignal", "libhardware", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14726,10 +14841,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libvcodec_cap.so"],
+			shared_libs: ["libui", "libcutils", "libutils", "libbinder", "libexpat", "liblog", "libvcodec_capenc", "libstagefright_omx_utils", "libstagefright_foundation", "libion", "android.hardware.graphics.bufferqueue@2.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14743,10 +14858,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libvcodec_capenc.so"],
+			shared_libs: ["liblog", "libion", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14760,10 +14875,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libvt_avsync.so"],
+			shared_libs: ["libbinder", "libutils", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14777,17 +14892,16 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so"],
+			shared_libs: ["libbinder_ndk", "android.hardware.common-V2-ndk", "android.hardware.common.fmq-V1-ndk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.mediatek.hardware.videotelephony@1.0.system_ext",
-	stem: "vendor.mediatek.hardware.videotelephony@1.0",
+	name: "vendor.mediatek.hardware.videotelephony@1.0",
 	owner: "realme",
 	strip: {
 		none: true,
@@ -14795,10 +14909,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	system_ext_specific: true,
 }
@@ -14812,10 +14926,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/odm/lib/liboemcrypto.so"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14829,10 +14943,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/libormshalclient.so"],
+			shared_libs: ["libbase", "libbinder", "liblog", "libhidlbase", "libutils", "libcutils", "libhardware", "vendor.oplus.hardware.orms@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14846,10 +14960,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/libpnscr2.so"],
+			shared_libs: ["liblog", "libcutils", "libhardware_legacy", "libhardware", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14863,10 +14977,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/sensors.virtual.so"],
+			shared_libs: ["liblog", "libcutils", "libxml2", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14880,16 +14994,16 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/vendor.oplus.hardware.appradio@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.oplus.hardware.biometrics.fingerprint@2.1.odm",
+	name: "vendor.oplus.hardware.biometrics.fingerprint@2.1_odm",
 	stem: "vendor.oplus.hardware.biometrics.fingerprint@2.1",
 	owner: "realme",
 	strip: {
@@ -14898,10 +15012,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/vendor.oplus.hardware.biometrics.fingerprint@2.1.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14915,10 +15029,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/vendor.oplus.hardware.biometrics.fingerprintservice@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14932,10 +15046,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/vendor.oplus.hardware.commondcs@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14949,10 +15063,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/vendor.oplus.hardware.orms@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -14966,10 +15080,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/lib64/vendor.oplus.hardware.radio@1.0.so"],
+			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	prefer: true,
 	device_specific: true,
 }
@@ -15070,7 +15184,7 @@ dex_import {
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.gpu@1.0-service",
+	name: "android.hardware.gpu@1.0-service.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.gpu@1.0-service.xml",
 	filename_from_src: true,
@@ -15079,7 +15193,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu",
+	name: "android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml",
 	filename_from_src: true,
@@ -15088,7 +15202,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "manifest",
+	name: "manifest.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/manifest.xml",
 	filename_from_src: true,
@@ -15097,7 +15211,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.3-service.widevine",
+	name: "manifest_android.hardware.drm@1.3-service.widevine.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
 	filename_from_src: true,
@@ -15106,7 +15220,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "oplus_appradio_device_manifest",
+	name: "oplus_appradio_device_manifest.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/oplus_appradio_device_manifest.xml",
 	filename_from_src: true,
@@ -15115,7 +15229,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "oplus_radio_device_manifest",
+	name: "oplus_radio_device_manifest.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/oplus_radio_device_manifest.xml",
 	filename_from_src: true,
@@ -15124,7 +15238,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.mediatek.hardware.dplanner@2.0-service",
+	name: "vendor.mediatek.hardware.dplanner@2.0-service.xml",
 	owner: "realme",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.mediatek.hardware.dplanner@2.0-service.xml",
 	filename_from_src: true,
@@ -15138,10 +15252,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/atcid"],
+			shared_libs: ["libmtkcutils", "libmtkutils", "libmtkrillog", "libmtkproperty", "vendor.mediatek.hardware.atci@1.0", "libhidlbase", "libhidltransport", "libhwbinder", "libnvram", "libfile_op", "libwifitest", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15155,10 +15269,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/audiocmdservice_atci"],
+			shared_libs: ["libcutils", "libutils", "libbinder", "liblog", "libaudiocompensationfilter_vendor", "libaudioprimarydevicehalifclient", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15172,10 +15286,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/autobt"],
+			shared_libs: ["liblog", "libcutils", "libbluetooth_hw_test", "libbluetooth_relayer", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15189,10 +15303,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/bip"],
+			shared_libs: ["libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15206,10 +15320,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/ccci_fsd"],
+			shared_libs: ["liblog", "libnvram", "libcutils", "libstorage_otp", "libhardware_legacy", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15223,10 +15337,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/ccci_mdinit"],
+			shared_libs: ["libsysenv", "libcutils", "liblog", "libnvram", "libccci_util", "libhardware_legacy", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15240,10 +15354,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/ccci_rpcd"],
+			shared_libs: ["libc", "liblog", "libcutils", "libhardware_legacy", "libc++", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15257,10 +15371,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/charon"],
+			shared_libs: ["libstrongswan", "libhydra", "libcharon-ss", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15274,10 +15388,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/dconfig"],
+			shared_libs: ["libtinyxml2", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15291,10 +15405,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/dexecutor"],
+			shared_libs: ["libhardware_legacy", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15308,10 +15422,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/doeapp-memtester"],
+			shared_libs: ["libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15325,10 +15439,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/doeapp-sat"],
+			shared_libs: ["libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15342,10 +15456,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/dtc_vendor"],
+			shared_libs: ["libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15359,10 +15473,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/em_hidl"],
+			shared_libs: ["liblog", "libbase", "libhardware", "libbinder", "libhidlbase", "libhidltransport", "libutils", "libcutils", "vendor.mediatek.hardware.engineermode@1.0", "vendor.mediatek.hardware.engineermode@1.1", "vendor.mediatek.hardware.engineermode@1.2", "vendor.mediatek.hardware.engineermode@1.3", "libbluetooth_relayer", "libbluetoothem_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15376,27 +15490,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/epdg_wod"],
+			shared_libs: ["libcutils", "libwo", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
-	strip: {
-		none: true,
-	},
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_binary {
-	name: "factory",
-	owner: "realme",
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/bin/factory"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15410,10 +15507,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/fuelgauged"],
+			shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15427,10 +15524,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/fuelgauged_nvram"],
+			shared_libs: ["libcutils", "libutils", "libnvram", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15444,10 +15541,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/gsm0710muxd"],
+			shared_libs: ["libmtkcutils", "libmtkrillog", "libmtkproperty", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15461,10 +15558,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-mediatek"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libhidlbase", "libhidltransport", "android.hardware.bluetooth@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15479,10 +15576,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"],
+			shared_libs: ["android.hardware.drm@1.0", "android.hardware.drm@1.1", "android.hardware.drm@1.2", "android.hardware.drm@1.3", "libbase", "libhidlbase", "liblog", "libutils", "libwvhidl", "libbinder", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15497,10 +15594,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-mediatek"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libbinder", "libhidlbase", "libhidltransport", "android.hardware.gnss@2.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15515,10 +15612,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.graphics.allocator@4.0-service-mediatek"],
+			shared_libs: ["android.hardware.graphics.allocator@4.0", "libhidlbase", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15533,10 +15630,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service.trustonic"],
+			shared_libs: ["android.hardware.keymaster@4.0", "libbase", "libcutils", "libhardware", "libhidlbase", "libkeymaster4", "liblog", "libutils", "libMcClient", "libcrypto", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15569,10 +15666,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service-mediatek"],
+			shared_libs: ["libhidlbase", "libutils", "android.hardware.secure_element@1.0", "android.hardware.secure_element@1.1", "android.hardware.secure_element@1.2", "libcutils", "liblog", "android.hardware.radio@1.0", "android.hardware.radio@1.1", "android.hardware.radio@1.2", "android.hardware.radio@1.3", "android.hardware.radio@1.4", "vendor.mediatek.hardware.mtkradioex@2.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15587,10 +15684,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/android.hardware.sensors@2.0-service-mediatek"],
+			shared_libs: ["liblog", "libcutils", "libhardware", "libhwbinder", "libbase", "libutils", "libhidlbase", "libhidltransport", "android.hardware.sensors@1.0", "android.hardware.sensors@2.0", "libfmq", "libpower", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15605,10 +15702,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/camerahalserver"],
+			shared_libs: ["libudf", "liblog", "libutils", "libcutils", "libbinder", "libhwbinder", "libhidlbase", "libhidltransport", "libmtkcam_stdutils", "libmtkcam_ulog", "libmtkcam_scenariorecorder", "libmtkcam_modulehelper", "android.hardware.camera.provider@2.4", "android.hardware.camera.provider@2.5", "android.hardware.camera.provider@2.6", "vendor.mediatek.hardware.camera.frhandler@1.0", "vendor.mediatek.hardware.camera.postproc@1.0", "vendor.mediatek.hardware.camera.isphal@1.0", "vendor.mediatek.hardware.camera.bgservice@1.0", "vendor.mediatek.hardware.camera.bgservice@1.1", "libhardware", "libmtkcam_grallocutils", "vendor.mediatek.hardware.camera.atms@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15623,10 +15720,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libmtkcutils", "librilfusion", "libmtkrilutils", "libsysenv", "libmtkconfigutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15641,10 +15738,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dfps@1.0-service"],
+			shared_libs: ["vendor.mediatek.hardware.dfps@1.0", "libbase", "libcutils", "libfmq", "libhardware", "libhidlbase", "libhidltransport", "liblog", "libsync", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15659,10 +15756,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dplanner@2.0-service"],
+			shared_libs: ["libhidlbase", "libutils", "vendor.mediatek.hardware.dplanner@2.0", "libziparchive", "libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15677,10 +15774,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.gpu@1.0-service"],
+			shared_libs: ["libbase", "libhidlbase", "liblog", "libutils", "libcutils", "vendor.mediatek.hardware.gpu@1.0", "libged", "libui", "libc", "libgralloc_extra", "libc++", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15695,10 +15792,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keyinstall@1.0-service"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.keyinstall@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15713,10 +15810,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libhidlbase", "libhidltransport", "vendor.mediatek.hardware.keymaster_attestation@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15731,10 +15828,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mms@1.5-service"],
+			shared_libs: ["libhidlbase", "libhidltransport", "liblog", "libutils", "libhardware", "vendor.mediatek.hardware.mms@1.5", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15749,10 +15846,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service"],
+			shared_libs: ["libhidlbase", "libhidltransport", "liblog", "libutils", "libhardware", "vendor.mediatek.hardware.mtkcodecservice@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15767,10 +15864,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service"],
+			shared_libs: ["libutils", "libcutils", "libhardware", "libhidlbase", "libhidltransport", "libbinder", "libnvram", "liblog", "vendor.mediatek.hardware.nvram@1.1", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15785,10 +15882,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service"],
+			shared_libs: ["libhidlbase", "libhidltransport", "liblog", "libutils", "libhardware", "vendor.mediatek.hardware.pq@2.6", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15803,10 +15900,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vendor.trustonic.tee@1.1-service"],
+			shared_libs: ["libbinder", "liblog", "libhidlbase", "libhidlmemory", "libutils", "libcutils", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "vendor.trustonic.tee@1.0", "vendor.trustonic.tee@1.1", "vendor.trustonic.tee.tui@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15821,10 +15918,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/hw/vtservice_hidl"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libbase", "libfmq", "vendor.mediatek.hardware.videotelephony@1.0_vendor", "libhardware", "libhwbinder", "libhidlbase", "libhidltransport", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15839,10 +15936,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/ipsec_mon"],
+			shared_libs: ["libcutils", "liblog", "libforkexecwrap", "libifcutils_mtk", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15856,10 +15953,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/jpegtool"],
+			shared_libs: ["liblog", "libcutils", "libutils", "libjpeg-alpha_vendor", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15873,10 +15970,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/lbs_hidl_service"],
+			shared_libs: ["liblog", "libcutils", "libbase", "libhardware", "libbinder", "libhidlbase", "libhidltransport", "libutils", "vendor.mediatek.hardware.lbs@1.0", "lbs_hidl_service-impl", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15890,10 +15987,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/mcDriverDaemon"],
+			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15907,10 +16004,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/md_monitor"],
+			shared_libs: ["libc++", "liblog", "libccci_util", "libselinux", "libcutils", "vendor.mediatek.hardware.mdmonitor@1.0", "libhidlbase", "libhidltransport", "libutils", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15924,10 +16021,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/md_monitor_ctrl"],
+			shared_libs: ["libc++", "liblog", "libutils", "libcutils", "vendor.mediatek.hardware.mdmonitor@1.0", "libhwbinder", "libhidlbase", "libhidltransport", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15941,10 +16038,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/mnld"],
+			shared_libs: ["libshim_sensors", "libmnl", "libcurl", "libcutils", "libnvram", "libcrypto", "libssl", "libz", "liblog", "libhardware", "libladder", "libDR", "libutils", "android.frameworks.sensorservice@1.0", "android.hardware.sensors@1.0", "libhidlbase", "libhidltransport", "libsensorndkbridge", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15958,10 +16055,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/mtk_agpsd"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libandroid_net", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15975,10 +16072,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/muxreport"],
+			shared_libs: ["libmtkrillog", "libmtkproperty", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -15992,10 +16089,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/netdagent"],
+			shared_libs: ["libcutils", "liblog", "libforkexecwrap", "libutils", "libhwbinder", "libhidlbase", "libhidltransport", "libifcutils_mtk", "vendor.mediatek.hardware.netdagent@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16009,10 +16106,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/netdc"],
+			shared_libs: ["libcutils", "liblog", "libutils", "libhidlbase", "vendor.mediatek.hardware.netdagent@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16026,10 +16123,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/nvram_daemon"],
+			shared_libs: ["libcutils", "libnvram", "libcustom_nvram", "libfile_op", "libnvram_daemon_callback", "liblog", "libhwm", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16043,10 +16140,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/ppl_agent"],
+			shared_libs: ["libutils", "libcutils", "liblog", "libhwbinder", "libbase", "libhidlbase", "libhidltransport", "libfile_op", "vendor.mediatek.hardware.pplagent@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16060,10 +16157,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/starter"],
+			shared_libs: ["libstrongswan", "libhydra", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16077,10 +16174,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/stp_dump3"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16094,10 +16191,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/stroke"],
+			shared_libs: ["libstrongswan", "libc", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16111,10 +16208,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/thermal"],
+			shared_libs: ["libcutils", "libifcutils_mtk", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16128,10 +16225,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/thermal_manager"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16145,10 +16242,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/thermalloadalgod"],
+			shared_libs: ["liblog", "libutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16162,10 +16259,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/volte_imcb"],
+			shared_libs: ["libvolte_core_shr", "libvolte_xdmc_shr", "libverno", "libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16179,10 +16276,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/volte_imsm_93"],
+			shared_libs: ["libcutils", "libverno", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16196,10 +16293,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/volte_md_status"],
+			shared_libs: ["libcutils", "libverno", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16213,10 +16310,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/volte_stack"],
+			shared_libs: ["libvolte_core_shr", "libvolte_xdmc_shr", "libipsec_ims_shr", "libverno", "libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16230,10 +16327,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/volte_ua"],
+			shared_libs: ["libvolte_core_shr", "libvolte_xdmc_shr", "libverno", "libcutils", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16247,10 +16344,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/vpud"],
+			shared_libs: ["libcutils", "libvpud_vcodec", "libvcodec_utility", "liblog", "libion", "libaedv", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16264,10 +16361,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm: {
 			srcs: ["proprietary/vendor/bin/wfca"],
+			shared_libs: ["liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "32",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16281,10 +16378,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/wlan_assistant"],
+			shared_libs: ["libc", "liblog", "libcutils", "libnl", "libc++", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16298,10 +16395,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/wmt_launcher"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16315,10 +16412,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/wmt_loader"],
+			shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16332,10 +16429,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/bin/xcap"],
+			shared_libs: ["libcurl-md", "libssl-md", "libcrypto-md", "libcutils", "libverno", "liblog", "libc", "libdl", "libm", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16349,10 +16446,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/bin/vtservice"],
+			shared_libs: ["libbinder", "libutils", "libcutils", "liblog", "libmtk_vt_service", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
@@ -16366,10 +16463,10 @@ cc_prebuilt_binary {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/odm/bin/hw/vendor.oplus.hardware.biometrics.fingerprint@2.1-service"],
+			shared_libs: ["libbinder", "liblog", "libhidlbase", "libhidltransport", "libutils", "vendor.oplus.hardware.biometrics.fingerprint@2.1", "vendor.oplus.hardware.biometrics.fingerprintservice@1.0", "libMcClient", "libhardware", "vendor.oplus.hardware.commondcs@1.0", "libcutils", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",
-	check_elf_files: false,
 	strip: {
 		none: true,
 	},
diff --git a/RM6785-common-vendor.mk b/RM6785-common-vendor.mk
index eaf9762..41a59f6 100644
--- a/RM6785-common-vendor.mk
+++ b/RM6785-common-vendor.mk
@@ -487,7 +487,6 @@ PRODUCT_COPY_FILES += \
     vendor/realme/RM6785-common/proprietary/vendor/etc/ecc_list_OP18.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP18.xml \
     vendor/realme/RM6785-common/proprietary/vendor/etc/ecc_list_OP20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP20.xml \
     vendor/realme/RM6785-common/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \
-    vendor/realme/RM6785-common/proprietary/vendor/etc/factory.ini:$(TARGET_COPY_OUT_VENDOR)/etc/factory.ini \
     vendor/realme/RM6785-common/proprietary/vendor/etc/file112.wav:$(TARGET_COPY_OUT_VENDOR)/etc/file112.wav \
     vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/agps_profiles_conf2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/agps_profiles_conf2.xml \
     vendor/realme/RM6785-common/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_ATnT_Mexico.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/carrier/agps_profiles_conf2_carrier_ATnT_Mexico.xml \
@@ -810,8 +809,11 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.mms@1.5-impl \
     vendor.mediatek.hardware.nvram@1.1-impl \
     vendor.mediatek.hardware.pq@2.6-impl \
+    libJpgEncPipe \
     libOpenCL \
     libTEECommon \
+    libaal_mtk \
+    libaalservice \
     libaedv \
     libbwc \
     libcapctrl \
@@ -838,6 +840,8 @@ PRODUCT_PACKAGES += \
     libion_mtk \
     libion_ulit \
     libipsec_ims_shr \
+    libjpeg-alpha-oal_vendor \
+    libjpeg-alpha_vendor \
     libladder \
     libmtcloader \
     libmtk_drvb \
@@ -866,6 +870,7 @@ PRODUCT_PACKAGES += \
     libverno \
     libvpu \
     libwo \
+    vendor.mediatek.hardware.audio@6.1 \
     vendor.mediatek.hardware.bluetooth.audio@2.1 \
     vendor.mediatek.hardware.gpu@1.0 \
     vendor.mediatek.hardware.keyinstall@1.0 \
@@ -971,7 +976,6 @@ PRODUCT_PACKAGES += \
     libvt_custom \
     libwvhidl \
     libwvdrmengine \
-    vendor.mediatek.hardware.audio@6.1 \
     vendor.mediatek.hardware.mtkcodecservice@1.1 \
     APUWareUtilsServer \
     APUWareXrpServer \
@@ -1369,7 +1373,6 @@ PRODUCT_PACKAGES += \
     libCamera_sarterqtechmains5kgm1sp_portrait_preview_full \
     libFaceBeautyCap \
     libFaceBeautyPre \
-    libJpgEncPipe \
     libMcClient \
     libPerfectlyClearCrux \
     libPolarrRender \
@@ -1388,8 +1391,6 @@ PRODUCT_PACKAGES += \
     lib_bsscore \
     libaal_cust \
     libaal_key \
-    libaal_mtk \
-    libaalservice \
     libakm \
     libapusys \
     libarcsoft_distortion_correction \
@@ -1481,8 +1482,6 @@ PRODUCT_PACKAGES += \
     libimageio \
     libimageio_plat_drv \
     libimageio_plat_pipe \
-    libjpeg-alpha-oal_vendor \
-    libjpeg-alpha_vendor \
     libkmsetkey \
     libksensor \
     liblpcnr \
@@ -1630,7 +1629,7 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.power@1.1 \
     vendor.mediatek.hardware.power@2.0 \
     vendor.mediatek.hardware.pplagent@1.0 \
-    vendor.mediatek.hardware.videotelephony@1.0 \
+    vendor.mediatek.hardware.videotelephony@1.0_vendor \
     vendor.trustonic.tee.tui@1.0 \
     vendor.trustonic.tee@1.0 \
     vendor.trustonic.tee@1.1 \
@@ -1649,13 +1648,13 @@ PRODUCT_PACKAGES += \
     libvcodec_capenc \
     libvt_avsync \
     vendor.mediatek.hardware.videotelephony-V1-ndk \
-    vendor.mediatek.hardware.videotelephony@1.0.system_ext \
+    vendor.mediatek.hardware.videotelephony@1.0 \
     liboemcrypto \
     libormshalclient \
     libpnscr2 \
     sensors.virtual \
     vendor.oplus.hardware.appradio@1.0 \
-    vendor.oplus.hardware.biometrics.fingerprint@2.1.odm \
+    vendor.oplus.hardware.biometrics.fingerprint@2.1_odm \
     vendor.oplus.hardware.biometrics.fingerprintservice@1.0 \
     vendor.oplus.hardware.commondcs@1.0 \
     vendor.oplus.hardware.orms@1.0 \
@@ -1673,13 +1672,13 @@ PRODUCT_PACKAGES += \
     mediatek-telephony-base \
     mediatek-telephony-common \
     com.android.hotwordenrollment.common.util \
-    android.hardware.gpu@1.0-service \
-    android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu \
-    manifest \
-    manifest_android.hardware.drm@1.3-service.widevine \
-    oplus_appradio_device_manifest \
-    oplus_radio_device_manifest \
-    vendor.mediatek.hardware.dplanner@2.0-service \
+    android.hardware.gpu@1.0-service.xml \
+    android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml \
+    manifest.xml \
+    manifest_android.hardware.drm@1.3-service.widevine.xml \
+    oplus_appradio_device_manifest.xml \
+    oplus_radio_device_manifest.xml \
+    vendor.mediatek.hardware.dplanner@2.0-service.xml \
     atcid \
     audiocmdservice_atci \
     autobt \
@@ -1695,7 +1694,6 @@ PRODUCT_PACKAGES += \
     dtc_vendor \
     em_hidl \
     epdg_wod \
-    factory \
     fuelgauged \
     fuelgauged_nvram \
     gsm0710muxd \
diff --git a/proprietary/odm/etc/audio/audio_param/SoundEnhancement_ParamUnitDesc.xml b/proprietary/odm/etc/audio/audio_param/SoundEnhancement_ParamUnitDesc.xml
index 5668d8d..5dff53b 100644
--- a/proprietary/odm/etc/audio/audio_param/SoundEnhancement_ParamUnitDesc.xml
+++ b/proprietary/odm/etc/audio/audio_param/SoundEnhancement_ParamUnitDesc.xml
@@ -9,4 +9,4 @@
 		<Param name="besloudness" type="int"/>
 		<Param name="hifi_audio" type="int" />
 		</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/odm/etc/audio/audio_param/Speech_ParamUnitDesc.xml b/proprietary/odm/etc/audio/audio_param/Speech_ParamUnitDesc.xml
index d574fc3..8c32acd 100644
--- a/proprietary/odm/etc/audio/audio_param/Speech_ParamUnitDesc.xml
+++ b/proprietary/odm/etc/audio/audio_param/Speech_ParamUnitDesc.xml
@@ -417,4 +417,4 @@
 			<Param name="sph_in_iir_mic1_pmv_qfactor" type="double_array"/>
 			<Param name="sph_in_iir_mic2_pmv_qfactor" type="double_array"/>
 	</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_AudioParam.xml b/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_AudioParam.xml
index 1523f50..663f410 100644
--- a/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_AudioParam.xml
+++ b/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_AudioParam.xml
@@ -21,4 +21,4 @@
 			<Param name="num of mic" value="2"/>
 		</ParamUnit>
 	</ParamUnitPool>
-</AudioParam>
+</AudioParam>
\ No newline at end of file
diff --git a/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_ParamUnitDesc.xml b/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_ParamUnitDesc.xml
index c2ad9ad..6e0e98e 100644
--- a/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_ParamUnitDesc.xml
+++ b/proprietary/odm/etc/audio/audio_param/UplinkConfiguration_ParamUnitDesc.xml
@@ -17,4 +17,4 @@
 		<!-- Open the num of mic -->
 		<Param name="num of mic" type="int"/>
 	</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/odm/etc/audio/audio_param/VoIPv2DMNR_ParamUnitDesc.xml b/proprietary/odm/etc/audio/audio_param/VoIPv2DMNR_ParamUnitDesc.xml
index f2b70d6..0b3a05d 100644
--- a/proprietary/odm/etc/audio/audio_param/VoIPv2DMNR_ParamUnitDesc.xml
+++ b/proprietary/odm/etc/audio/audio_param/VoIPv2DMNR_ParamUnitDesc.xml
@@ -894,4 +894,4 @@
 		<Param name="sph_in_iir_enh_pmv_qfactor" type="double_array"/>
 		<Param name="sph_out_iir_enh_pmv_qfactor" type="double_array"/>
 	</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/vendor/bin/atcid b/proprietary/vendor/bin/atcid
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/audiocmdservice_atci b/proprietary/vendor/bin/audiocmdservice_atci
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/autobt b/proprietary/vendor/bin/autobt
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/bip b/proprietary/vendor/bin/bip
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/ccci_fsd b/proprietary/vendor/bin/ccci_fsd
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/ccci_mdinit b/proprietary/vendor/bin/ccci_mdinit
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/ccci_rpcd b/proprietary/vendor/bin/ccci_rpcd
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/charon b/proprietary/vendor/bin/charon
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/dconfig b/proprietary/vendor/bin/dconfig
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/dexecutor b/proprietary/vendor/bin/dexecutor
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/doeapp-memtester b/proprietary/vendor/bin/doeapp-memtester
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/doeapp-sat b/proprietary/vendor/bin/doeapp-sat
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/dtc_vendor b/proprietary/vendor/bin/dtc_vendor
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/epdg_wod b/proprietary/vendor/bin/epdg_wod
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/factory b/proprietary/vendor/bin/factory
deleted file mode 100755
index e8d687c..0000000
Binary files a/proprietary/vendor/bin/factory and /dev/null differ
diff --git a/proprietary/vendor/bin/fuelgauged b/proprietary/vendor/bin/fuelgauged
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/fuelgauged_nvram b/proprietary/vendor/bin/fuelgauged_nvram
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/gsm0710muxd b/proprietary/vendor/bin/gsm0710muxd
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/ipsec_mon b/proprietary/vendor/bin/ipsec_mon
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/jpegtool b/proprietary/vendor/bin/jpegtool
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/lbs_hidl_service b/proprietary/vendor/bin/lbs_hidl_service
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/mcDriverDaemon b/proprietary/vendor/bin/mcDriverDaemon
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/md_monitor b/proprietary/vendor/bin/md_monitor
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/md_monitor_ctrl b/proprietary/vendor/bin/md_monitor_ctrl
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/mnld b/proprietary/vendor/bin/mnld
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/mtk_agpsd b/proprietary/vendor/bin/mtk_agpsd
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/muxreport b/proprietary/vendor/bin/muxreport
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/netdagent b/proprietary/vendor/bin/netdagent
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/netdc b/proprietary/vendor/bin/netdc
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/nvram_daemon b/proprietary/vendor/bin/nvram_daemon
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/ppl_agent b/proprietary/vendor/bin/ppl_agent
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/starter b/proprietary/vendor/bin/starter
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/stp_dump3 b/proprietary/vendor/bin/stp_dump3
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/stroke b/proprietary/vendor/bin/stroke
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/thermal b/proprietary/vendor/bin/thermal
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/thermal_manager b/proprietary/vendor/bin/thermal_manager
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/thermalloadalgod b/proprietary/vendor/bin/thermalloadalgod
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/volte_imcb b/proprietary/vendor/bin/volte_imcb
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/volte_imsm_93 b/proprietary/vendor/bin/volte_imsm_93
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/volte_md_status b/proprietary/vendor/bin/volte_md_status
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/volte_stack b/proprietary/vendor/bin/volte_stack
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/volte_ua b/proprietary/vendor/bin/volte_ua
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/vpud b/proprietary/vendor/bin/vpud
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/wfca b/proprietary/vendor/bin/wfca
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/wlan_assistant b/proprietary/vendor/bin/wlan_assistant
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/wmt_launcher b/proprietary/vendor/bin/wmt_launcher
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/wmt_loader b/proprietary/vendor/bin/wmt_loader
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/bin/xcap b/proprietary/vendor/bin/xcap
old mode 100755
new mode 100644
diff --git a/proprietary/vendor/etc/audio_param/SoundEnhancement_ParamUnitDesc.xml b/proprietary/vendor/etc/audio_param/SoundEnhancement_ParamUnitDesc.xml
index 5668d8d..5dff53b 100644
--- a/proprietary/vendor/etc/audio_param/SoundEnhancement_ParamUnitDesc.xml
+++ b/proprietary/vendor/etc/audio_param/SoundEnhancement_ParamUnitDesc.xml
@@ -9,4 +9,4 @@
 		<Param name="besloudness" type="int"/>
 		<Param name="hifi_audio" type="int" />
 		</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/vendor/etc/audio_param/Speech_ParamUnitDesc.xml b/proprietary/vendor/etc/audio_param/Speech_ParamUnitDesc.xml
index 52d2cb8..1805c25 100644
--- a/proprietary/vendor/etc/audio_param/Speech_ParamUnitDesc.xml
+++ b/proprietary/vendor/etc/audio_param/Speech_ParamUnitDesc.xml
@@ -430,4 +430,4 @@
 		<Param name="sph_in_iir_mic1_pmv_qfactor" type="double_array"/>
 		<Param name="sph_in_iir_mic2_pmv_qfactor" type="double_array"/>
 	</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/vendor/etc/audio_param/UplinkConfiguration_AudioParam.xml b/proprietary/vendor/etc/audio_param/UplinkConfiguration_AudioParam.xml
index 1523f50..663f410 100644
--- a/proprietary/vendor/etc/audio_param/UplinkConfiguration_AudioParam.xml
+++ b/proprietary/vendor/etc/audio_param/UplinkConfiguration_AudioParam.xml
@@ -21,4 +21,4 @@
 			<Param name="num of mic" value="2"/>
 		</ParamUnit>
 	</ParamUnitPool>
-</AudioParam>
+</AudioParam>
\ No newline at end of file
diff --git a/proprietary/vendor/etc/audio_param/UplinkConfiguration_ParamUnitDesc.xml b/proprietary/vendor/etc/audio_param/UplinkConfiguration_ParamUnitDesc.xml
index c2ad9ad..6e0e98e 100644
--- a/proprietary/vendor/etc/audio_param/UplinkConfiguration_ParamUnitDesc.xml
+++ b/proprietary/vendor/etc/audio_param/UplinkConfiguration_ParamUnitDesc.xml
@@ -17,4 +17,4 @@
 		<!-- Open the num of mic -->
 		<Param name="num of mic" type="int"/>
 	</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/vendor/etc/audio_param/VoIPv2DMNR_ParamUnitDesc.xml b/proprietary/vendor/etc/audio_param/VoIPv2DMNR_ParamUnitDesc.xml
index f2b70d6..0b3a05d 100644
--- a/proprietary/vendor/etc/audio_param/VoIPv2DMNR_ParamUnitDesc.xml
+++ b/proprietary/vendor/etc/audio_param/VoIPv2DMNR_ParamUnitDesc.xml
@@ -894,4 +894,4 @@
 		<Param name="sph_in_iir_enh_pmv_qfactor" type="double_array"/>
 		<Param name="sph_out_iir_enh_pmv_qfactor" type="double_array"/>
 	</ParamUnit>
-</ParamUnitDesc>
+</ParamUnitDesc>
\ No newline at end of file
diff --git a/proprietary/vendor/etc/factory.ini b/proprietary/vendor/etc/factory.ini
deleted file mode 100644
index 03475ce..0000000
--- a/proprietary/vendor/etc/factory.ini
+++ /dev/null
@@ -1,185 +0,0 @@
-// test item and test flow configuration
-MenuItem=按键(M);
-MenuItem=指纹测试(A);
-MenuItem=轨迹球(M);
-MenuItem=光学手指导航键(M);
-MenuItem=触摸屏(M);
-MenuItem=LCM测试;
-MenuItem=背光等级(M);
-MenuItem=Storage(A);
-MenuItem=显示屏(M);
-MenuItem=NAND闪存(A);
-MenuItem=存储卡(A);
-MenuItem=SIM卡探测(A);
-MenuItem=信号测试(M);
-MenuItem=振动器(M);
-MenuItem=LED灯(M);
-MenuItem=实时时钟(A);
-MenuItem=回路(A);
-//MenuItem=双麦克风回路(M);
-MenuItem=回路(手机麦克风-扬声器)(A);
-MenuItem=手机麦克扬声器回路(A);
-MenuItem=铃声(A);
-MenuItem=接收器(A);
-MenuItem=Wave回放(M);
-MenuItem=喇叭阻值校正(A);
-MenuItem=扬声器OC测试(M);
-MenuItem=耳机(A);
-MenuItem=加速度传感器(M);
-//MenuItem=加速度传感器校准(M);
-MenuItem=磁力计传感器(M);
-MenuItem=光传感器距离传感器(M);
-MenuItem=陀螺仪传感器(M);
-//MenuItem=陀螺仪传感器校准(M);
-MenuItem=气压传感器(M);
-//MenuItem=湿度传感器(M);
-MenuItem=主照相机(A);
-MenuItem=副照相机(A);
-MenuItem=主照相机2(A);
-MenuItem=主照相机3(A);
-MenuItem=主照相机4(A);
-MenuItem=Main Lens(M);
-MenuItem=Sub Lens(M);
-MenuItem=闪光灯(M);
-MenuItem=GPS定位(A);
-MenuItem=近场通信NFC(M);
-MenuItem=FM收音机(A);
-MenuItem=FM发射器(M);
-MenuItem=蓝牙(A);
-MenuItem=Wi-Fi(A);
-MenuItem=手机电视(A);
-MenuItem=移动电视(A);
-MenuItem=电池和充电(A);
-MenuItem=Slave Charger(M);
-MenuItem=闲置电流(M);
-MenuItem=HDMI(A);
-MenuItem=BTS(A);
-MenuItem=EXT BUCK(M);
-MenuItem=Universal ANT Test(A);
-MenuItem=RF Test(A);
-MenuItem=C2K RF Test(A);
-MenuItem=OTG(A);
-MenuItem=USBTYPEC(A);
-MenuItem=IrTx LED 测试;
-MenuItem=EFUSE(A);
-
-//FM Radio
-FMRadio.CH1=885;
-FMRadio.CH2=1058;
-FMRadio.CH3=980;
-FMRadio.CH4=1080;
-FMRadio.RSSITH=-95;
-
-//FM Transmitter
-FMTX.CH1=878;
-FMTX.CH2=886;
-FMTX.CH3=891;
-FMTX.CH4=910;
-FMTX.CH5=920;
-FMTX.CH6=930;
-FMTX.CH7=940;
-FMTX.CH8=990;
-FMTX.CH9=1050;
-FMTX.CH10=1070;
-
-//WIFI
-WIFI.SSID=mtkguest;
-
-//Vibrator
-Vibrator_Last_Time=0;
-//AUDIO
-Audio.Ringtone=5;
-Audio.Receiver=0;
-Freq.Ringtone=1000;
-Audio.Record.Dump=0;
-Audio.Mic.Sets=1,2,3;
-
-Loopback.Speaker.chToCheck=ALL;
-Lower.Magnitude.Speaker.L=1000000,1000000,500000,500000;
-Upper.Magnitude.Speaker.L=1000000000,1000000000,1000000000,1000000000;
-Lower.Magnitude.Speaker.R=1000000,1000000,500000,500000;
-Upper.Magnitude.Speaker.R=1000000000,1000000000,1000000000,1000000000;
-
-Loopback.Receiver.chToCheck=R;
-Lower.Magnitude.Receiver.L=100;
-Upper.Magnitude.Receiver.L=1000000000;
-Lower.Magnitude.Receiver.R=1000;
-Upper.Magnitude.Receiver.R=1000000000;
-
-Lower.Magnitude.Headset=1000;
-Upper.Magnitude.Headset=1000000000;
-
-//RF Test
-RF.band=28
-RF.dl.earfcn=9435
-RF.rssi0.dbm=-97
-RF.rssi1.dbm=-97
-
-GSM.RF.test=0;
-GSM.RF.arfcn=37;
-GSM.RF.gain=7;
-GSM.RF.band=8;
-GSM.RF.pattern=1;
-GSM.RF.rssi0.dbm=-90;
-
-WCDMA.RF.test=1;
-WCDMA.RF.uarfcn=4458;
-WCDMA.RF.rssi0.dbm=-70;
-WCDMA.RF.rssi1.dbm=-70;
-
-LTE.RF.test=1;
-LTE.RF.band=40;
-LTE.RF.dl.earfcn=39150;
-LTE.RF.rssi0.dbm=-55;
-LTE.RF.rssi1.dbm=-55;
-
-TDSCDMA.RF.test=0;
-TDSCDMA.RF.uarfcn=9500;
-TDSCDMA.RF.rssi0.dbm=-90;
-
-C2K.RF.test=0;
-C2K.RF.subsystem=0;
-C2K.RF.band=0;
-C2K.RF.channel=384;
-C2K.RF.rssi0.dbm=-90;
-C2K.RF.rssi1.dbm=-90;
-
-
-//AudioWavePlayFile
-/res/sound/testpattern1.wav
-
-//AudioRingtonePlayFile
-/res/sound/ringtone.wav
-
-//AudioReceiverFreq2K
-/res/sound/sinewave2k.wav
-
-//AudioReceiverFreq25K
-/res/sound/sinewave25k.wav
-
-//AudioReceiverFreq3K
-/res/sound/sinewave3k.wav
-
-//AudioReceiverFreq35K
-/res/sound/sinewave35k.wav
-
-//AudioReceiverFreq4K
-/res/sound/sinewave4k.wav
-
-//AudioSpeakerFreq05K
-/res/sound/sinewave05k.wav
-
-//AudioSpeakerFreq075K
-/res/sound/sinewave075k.wav
-
-//AudioSpeakerFreq1K
-/res/sound/sinewave1k.wav
-
-//AudioSpeakerFreq15K
-/res/sound/sinewave15k.wav
-
-//AudioSpeakerFreq2K
-/res/sound/sinewave2k.wav
-
-//SpeakerCalibrationPlayFile
-/res/sound/CalibrationPatternOut.wav
diff --git a/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_CT.xml b/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_CT.xml
index d1e851f..6de7b47 100644
--- a/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_CT.xml
+++ b/proprietary/vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_CT.xml
@@ -30,4 +30,4 @@
     sha_version="0"
   />
 
-</mtk_agps_profiles>
+</mtk_agps_profiles>
\ No newline at end of file
diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml
index e2f77a3..cab5032 100644
--- a/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml
+++ b/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu.xml
@@ -6,4 +6,4 @@
         <fqname>@1.3::IDevice/mtk-gpu</fqname>
         <fqname>@1.3::IDevice/mtk-neuron</fqname>
     </hal>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/proprietary/vendor/lib/libJpgEncPipe.so b/proprietary/vendor/lib/libJpgEncPipe.so
new file mode 100644
index 0000000..8776ff1
Binary files /dev/null and b/proprietary/vendor/lib/libJpgEncPipe.so differ
diff --git a/proprietary/vendor/lib/libaal_mtk.so b/proprietary/vendor/lib/libaal_mtk.so
new file mode 100644
index 0000000..7199641
Binary files /dev/null and b/proprietary/vendor/lib/libaal_mtk.so differ
diff --git a/proprietary/vendor/lib/libaalservice.so b/proprietary/vendor/lib/libaalservice.so
new file mode 100644
index 0000000..6a52932
Binary files /dev/null and b/proprietary/vendor/lib/libaalservice.so differ
diff --git a/proprietary/vendor/lib/libalsautils-v30.so b/proprietary/vendor/lib/libalsautils-v30.so
index 25791d1..be96d9c 100644
Binary files a/proprietary/vendor/lib/libalsautils-v30.so and b/proprietary/vendor/lib/libalsautils-v30.so differ
diff --git a/proprietary/vendor/lib/libjpeg-alpha-oal_vendor.so b/proprietary/vendor/lib/libjpeg-alpha-oal_vendor.so
new file mode 100644
index 0000000..b2cd82f
Binary files /dev/null and b/proprietary/vendor/lib/libjpeg-alpha-oal_vendor.so differ
diff --git a/proprietary/vendor/lib/libjpeg-alpha_vendor.so b/proprietary/vendor/lib/libjpeg-alpha_vendor.so
new file mode 100644
index 0000000..da48d3c
Binary files /dev/null and b/proprietary/vendor/lib/libjpeg-alpha_vendor.so differ
diff --git a/proprietary/vendor/lib/libmnl.so b/proprietary/vendor/lib/libmnl.so
index 9f76f41..3cf7193 100644
Binary files a/proprietary/vendor/lib/libmnl.so and b/proprietary/vendor/lib/libmnl.so differ
diff --git a/proprietary/vendor/lib/libspeech_enh_lib.so b/proprietary/vendor/lib/libspeech_enh_lib.so
index 0b38c92..201084c 100644
Binary files a/proprietary/vendor/lib/libspeech_enh_lib.so and b/proprietary/vendor/lib/libspeech_enh_lib.so differ
diff --git a/proprietary/vendor/lib/libwvhidl.so b/proprietary/vendor/lib/libwvhidl.so
index 3a368fb..87af6aa 100644
Binary files a/proprietary/vendor/lib/libwvhidl.so and b/proprietary/vendor/lib/libwvhidl.so differ
diff --git a/proprietary/vendor/lib/mediadrm/libwvdrmengine.so b/proprietary/vendor/lib/mediadrm/libwvdrmengine.so
index 2cdf16a..d24b0cf 100644
Binary files a/proprietary/vendor/lib/mediadrm/libwvdrmengine.so and b/proprietary/vendor/lib/mediadrm/libwvdrmengine.so differ
diff --git a/proprietary/vendor/lib64/lib3a.flash.so b/proprietary/vendor/lib64/lib3a.flash.so
index 6d24058..7aed8b7 100644
Binary files a/proprietary/vendor/lib64/lib3a.flash.so and b/proprietary/vendor/lib64/lib3a.flash.so differ
diff --git a/proprietary/vendor/lib64/libcam.halsensor.so b/proprietary/vendor/lib64/libcam.halsensor.so
index 1fb10d4..69326f9 100644
Binary files a/proprietary/vendor/lib64/libcam.halsensor.so and b/proprietary/vendor/lib64/libcam.halsensor.so differ
diff --git a/proprietary/vendor/lib64/liboppo_aisd.so b/proprietary/vendor/lib64/liboppo_aisd.so
index c57634d..e1c857f 100644
Binary files a/proprietary/vendor/lib64/liboppo_aisd.so and b/proprietary/vendor/lib64/liboppo_aisd.so differ
diff --git a/proprietary/vendor/lib64/liboppo_blank_algo.so b/proprietary/vendor/lib64/liboppo_blank_algo.so
index 0ac89ba..184223a 100644
Binary files a/proprietary/vendor/lib64/liboppo_blank_algo.so and b/proprietary/vendor/lib64/liboppo_blank_algo.so differ
diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.audio@6.1.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.audio@6.1.so
new file mode 100644
index 0000000..05391d9
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.mediatek.hardware.audio@6.1.so differ