diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 6a39cbd..6cc2bc2 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -6,7 +6,6 @@
         Healthd_enable_op_fastchg struct {
                 Cflags []string
         }
-
 	TargetNeedsHWCOnFirstRef struct {
 		Cflags []string
 	}
@@ -17,14 +16,17 @@
                 Whole_static_libs []string
                 Cflags []string
         }
-
+        Target_camera_needs_client_info struct {
+                Cflags []string
+        }
 }
 
 type ProductVariables struct {
-	Healthd_use_battery_info   *bool `json:",omitempty"`
-	Healthd_enable_op_fastchg  *bool `json:",omitempty"`
-	TargetNeedsHWCOnFirstRef   *bool `json:",omitempty"`
-	Uses_metadata_as_fde_key   *bool `json:",omitempty"`
-	Target_use_sdclang         *bool `json:",omitempty"`
-	Target_init_vendor_lib     *string `json:",omitempty"`
+	Healthd_use_battery_info                *bool `json:",omitempty"`
+	Healthd_enable_op_fastchg               *bool `json:",omitempty"`
+	TargetNeedsHWCOnFirstRef                *bool `json:",omitempty"`
+	Uses_metadata_as_fde_key                *bool `json:",omitempty"`
+	Target_use_sdclang                      *bool `json:",omitempty"`
+	Target_camera_needs_client_info         *bool `json:",omitempty"`
+	Target_init_vendor_lib                  *string `json:",omitempty"`
 }
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index d72e91a..c31fb24 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -3,11 +3,12 @@
 _contents := $(_contents)    "Omnirom": {$(newline)
 
 # See build/core/soong_config.mk for the add_json_* functions you can use here.
-$(call add_json_bool, Healthd_use_battery_info,  $(filter true,$(HEALTHD_USE_BATTERY_INFO)))
-$(call add_json_bool, Healthd_enable_op_fastchg, $(filter true,$(HEALTHD_ENABLE_OP_FASTCHG_CHECK)))
-$(call add_json_bool, TargetNeedsHWCOnFirstRef,  $(filter true,$(TARGET_NEEDS_HWC_ONFIRSTREF)))
-$(call add_json_bool, Uses_metadata_as_fde_key,  $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))
-$(call add_json_bool, Target_use_sdclang,        $(filter true,$(TARGET_USE_SDCLANG)))
+$(call add_json_bool, Healthd_use_battery_info,               $(filter true,$(HEALTHD_USE_BATTERY_INFO)))
+$(call add_json_bool, Healthd_enable_op_fastchg,              $(filter true,$(HEALTHD_ENABLE_OP_FASTCHG_CHECK)))
+$(call add_json_bool, TargetNeedsHWCOnFirstRef,               $(filter true,$(TARGET_NEEDS_HWC_ONFIRSTREF)))
+$(call add_json_bool, Uses_metadata_as_fde_key,               $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))
+$(call add_json_bool, Target_use_sdclang,                     $(filter true,$(TARGET_USE_SDCLANG)))
+$(call add_json_bool, Target_camera_needs_client_info,        $(filter true,$(TARGET_CAMERA_NEEDS_CLIENT_INFO)))
 $(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB))
 
 # This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.