diff --git a/Android.bp b/Android.bp
index 76af1e6..02c7daa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -223,6 +223,93 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "com.samsung.sensor.hi847",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/camera/com.samsung.sensor.hi847.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "camera",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "com.samsung.sensor.imx555",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/camera/com.samsung.sensor.imx555.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "camera",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "com.samsung.sensor.imx616",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/camera/com.samsung.sensor.imx616.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "liblog",
+                "libofflinelog",
+                "libsync",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "camera",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "com.samsung.sensor.s5k3l6",
     owner: "samsung",
diff --git a/proprietary/vendor/lib64/camera/com.samsung.sensor.hi847.so b/proprietary/vendor/lib64/camera/com.samsung.sensor.hi847.so
new file mode 100644
index 0000000..60c0649
Binary files /dev/null and b/proprietary/vendor/lib64/camera/com.samsung.sensor.hi847.so differ
diff --git a/proprietary/vendor/lib64/camera/com.samsung.sensor.imx555.so b/proprietary/vendor/lib64/camera/com.samsung.sensor.imx555.so
new file mode 100644
index 0000000..8226e29
Binary files /dev/null and b/proprietary/vendor/lib64/camera/com.samsung.sensor.imx555.so differ
diff --git a/proprietary/vendor/lib64/camera/com.samsung.sensor.imx616.so b/proprietary/vendor/lib64/camera/com.samsung.sensor.imx616.so
new file mode 100644
index 0000000..61a883d
Binary files /dev/null and b/proprietary/vendor/lib64/camera/com.samsung.sensor.imx616.so differ
diff --git a/r8q-vendor.mk b/r8q-vendor.mk
index 0c9d1ca..71a2dee 100644
--- a/r8q-vendor.mk
+++ b/r8q-vendor.mk
@@ -103,6 +103,9 @@ PRODUCT_PACKAGES += \
     X12QS_libTsAwb \
     X12QS_libTsPdafm \
     android.hardware.secure_element-impl-gto \
+    com.samsung.sensor.hi847 \
+    com.samsung.sensor.imx555 \
+    com.samsung.sensor.imx616 \
     com.samsung.sensor.s5k3l6 \
     com.qti.camx.chiiqutils \
     com.qti.eisv2 \