diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index c11ec95..67452c7 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -25,6 +25,20 @@
 	Target_process_sdk_version_override struct {
 		Cppflags []string
 	}
+        Device_support_hwfde struct {
+                Cflags []string
+		Header_libs []string
+		Shared_libs []string
+	}
+	Device_support_hwfde_perf struct {
+		Cflags []string
+	}
+	Device_support_legacy_hwfde struct {
+		Cflags []string
+	}
+	Device_support_wait_for_qsee struct {
+		Cflags []string
+	}
 }
 
 type ProductVariables struct {
@@ -36,5 +50,9 @@
 	Uses_nvidia_enhancements  *bool `json:",omitempty"`
 	Uses_qcom_bsp_legacy  *bool `json:",omitempty"`
 	Uses_qti_camera_device  *bool `json:",omitempty"`
- 	Target_process_sdk_version_override *string `json:",omitempty"`
+	Target_process_sdk_version_override *string `json:",omitempty"`
+	Device_support_hwfde       *bool `json:",omitempty"`
+	Device_support_hwfde_perf  *bool `json:",omitempty"`
+	Device_support_legacy_hwfde  *bool `json:",omitempty"`
+	Device_support_wait_for_qsee  *bool `json:",omitempty"`
 }
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index d4ea787..91e0b41 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -4,6 +4,10 @@
 
 # See build/core/soong_config.mk for the add_json_* functions you can use here.
 $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))
+$(call add_json_bool, Device_support_hwfde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
+$(call add_json_bool, Device_support_hwfde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
+$(call add_json_bool, Device_support_legacy_hwfde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
+$(call add_json_bool, Device_support_wait_for_qsee, $(filter true,$(TARGET_KEYMASTER_WAIT_FOR_QSEE)))
 $(call add_json_bool, Has_legacy_camera_hal1,                $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
 $(call add_json_str,  Specific_camera_parameter_library,     $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
 $(call add_json_str_omitempty, Target_shim_libs,             $(TARGET_LD_SHIM_LIBS))