diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 61334b4..6d79e90 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -225,57 +225,6 @@
 }
 
 soong_config_module_type {
-    name: "no_cameraserver",
-    module_type: "cc_defaults",
-    config_namespace: "blissGlobalVars",
-    bool_variables: ["has_legacy_camera_hal1"],
-    properties: [
-        "cppflags",
-    ],
-}
-
-no_cameraserver {
-    name: "no_cameraserver_defaults",
-    soong_config_variables: {
-        has_legacy_camera_hal1: {
-            cppflags: [
-                "-DNO_CAMERA_SERVER",
-                "-Wno-overloaded-virtual",
-            ],
-        },
-    },
-}
-
-soong_config_module_type {
-    name: "camera_in_mediaserver",
-    module_type: "cc_defaults",
-    config_namespace: "blissGlobalVars",
-    bool_variables: ["has_legacy_camera_hal1"],
-    properties: [
-        "overrides",
-        "shared_libs",
-    ],
-}
-
-camera_in_mediaserver {
-    name: "camera_in_mediaserver_defaults",
-    defaults: ["no_cameraserver_defaults"],
-    soong_config_variables: {
-        has_legacy_camera_hal1: {
-            overrides: ["cameraserver"],
-            shared_libs: [
-                "android.hardware.camera.common@1.0",
-                "android.hardware.camera.device@3.4",
-                "android.hardware.camera.provider@2.6",
-                "android.hardware.camera.provider@2.7",
-                "libcameraservice",
-                "libgui",
-            ],
-        },
-    },
-}
-
-soong_config_module_type {
     name: "has_memfd_backport",
     module_type: "cc_defaults",
     config_namespace: "blissGlobalVars",
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index cde2813..afd237d 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -31,7 +31,6 @@
     additional_gralloc_10_usage_bits \
     bootloader_message_offset \
     disable_postrender_cleanup \
-    has_legacy_camera_hal1 \
     has_memfd_backport \
     ignores_ftp_pptp_conntrack_failure \
     needs_netd_direct_connect_rule \
@@ -66,7 +65,6 @@
 
 # Soong bool variables
 SOONG_CONFIG_blissGlobalVars_disable_postrender_cleanup := $(TARGET_DISABLE_POSTRENDER_CLEANUP)
-SOONG_CONFIG_blissGlobalVars_has_legacy_camera_hal1 := $(TARGET_HAS_LEGACY_CAMERA_HAL1)
 SOONG_CONFIG_blissGlobalVars_has_memfd_backport := $(TARGET_HAS_MEMFD_BACKPORT)
 SOONG_CONFIG_blissGlobalVars_ignores_ftp_pptp_conntrack_failure := $(TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE)
 SOONG_CONFIG_blissGlobalVars_needs_netd_direct_connect_rule := $(TARGET_NEEDS_NETD_DIRECT_CONNECT_RULE)