diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 5186d746e..1b5617ee6 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -52,18 +52,22 @@ cc_library_headers {
 
 // Target platform agnostic config modules
 soong_config_module_type {
-    name: "camera_needs_client_info",
+    name: "camera_needs_client_info_lib",
     module_type: "cc_defaults",
-    config_namespace: "customGlobalVars",
-    bool_variables: ["camera_needs_client_info"],
-    properties: ["cppflags"],
+    config_namespace: "lineageGlobalVars",
+    bool_variables: ["camera_needs_client_info_lib"],
+    properties: [
+        "cppflags",
+        "shared_libs",
+    ],
 }
 
-camera_needs_client_info {
-    name: "camera_needs_client_info_defaults",
+camera_needs_client_info_lib {
+    name: "camera_needs_client_info_lib_defaults",
     soong_config_variables: {
-        camera_needs_client_info: {
-            cppflags: ["-DCAMERA_NEEDS_CLIENT_INFO"],
+        camera_needs_client_info_lib: {
+            cppflags: ["-DCAMERA_NEEDS_CLIENT_INFO_LIB"],
+            shared_libs: ["//device/oneplus/common:vendor.oneplus.hardware.camera@1.0"],
         },
     },
 }
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 217b13708..6428456b8 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -30,7 +30,7 @@ SOONG_CONFIG_NAMESPACES += lineageGlobalVars
 SOONG_CONFIG_lineageGlobalVars += \
     additional_gralloc_10_usage_bits \
     bootloader_message_offset \
-    camera_needs_client_info \
+    camera_needs_client_info_lib \
     disable_postrender_cleanup \
     has_legacy_camera_hal1 \
     has_memfd_backport \
@@ -65,7 +65,7 @@ SOONG_CONFIG_lineageQcomVars += \
 endif
 
 # Soong bool variables
-SOONG_CONFIG_lineageGlobalVars_camera_needs_client_info := $(TARGET_CAMERA_NEEDS_CLIENT_INFO)
+SOONG_CONFIG_lineageGlobalVars_camera_needs_client_info_lib := $(TARGET_CAMERA_NEEDS_CLIENT_INFO_LIB)
 SOONG_CONFIG_lineageGlobalVars_disable_postrender_cleanup := $(TARGET_DISABLE_POSTRENDER_CLEANUP)
 SOONG_CONFIG_lineageGlobalVars_has_legacy_camera_hal1 := $(TARGET_HAS_LEGACY_CAMERA_HAL1)
 SOONG_CONFIG_lineageGlobalVars_has_memfd_backport := $(TARGET_HAS_MEMFD_BACKPORT)
diff --git a/config/common_full_tablet.mk b/config/common_full_tablet.mk
new file mode 100644
index 000000000..224e454e7
--- /dev/null
+++ b/config/common_full_tablet.mk
@@ -0,0 +1,11 @@
+# Inherit full common Lineage stuff
+$(call inherit-product, vendor/lineage/config/common_full.mk)
+
+# Required packages
+PRODUCT_PACKAGES += \
+    LatinIME
+
+# Include Lineage LatinIME dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
+
+$(call inherit-product, vendor/lineage/config/telephony.mk)
diff --git a/config/common_mini_tablet.mk b/config/common_mini_tablet.mk
new file mode 100644
index 000000000..6b2c57ade
--- /dev/null
+++ b/config/common_mini_tablet.mk
@@ -0,0 +1,8 @@
+# Inherit mini common Lineage stuff
+$(call inherit-product, vendor/lineage/config/common_mini.mk)
+
+# Required packages
+PRODUCT_PACKAGES += \
+    LatinIME
+
+$(call inherit-product, vendor/lineage/config/telephony.mk)