Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b08fa758 authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "soong_config: Add flag for devices use metadata as FDE key" 

* Qcom reverted the relevant commit in cryptfs_hw

This reverts commit a4d6ce67.

Change-Id: Ife1812ebc80946953e3d1a558617c94ddbc7fad4
parent 6eaad8d3

build/soong/android/variable.go

+0 −4
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ type Product_variables struct { 
	Uses_generic_camera_parameter_library struct {

		Srcs []string

	}

	Uses_metadata_as_fde_key struct {

		Cflags []string

	}

	Uses_nvidia_enhancements struct {

		Cppflags []string

	}
@@ -89,7 +86,6 @@ type ProductVariables struct { 
	Target_process_sdk_version_override  *string `json:",omitempty"`

	Target_shim_libs  *string `json:",omitempty"`

	Uses_generic_camera_parameter_library  *bool `json:",omitempty"`

	Uses_metadata_as_fde_key  *bool `json:",omitempty"`

	Uses_nvidia_enhancements  *bool `json:",omitempty"`

	Uses_qcom_bsp_legacy  *bool `json:",omitempty"`

	Uses_qti_camera_device  *bool `json:",omitempty"`

build/soong/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ $(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB) 
$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))

$(call add_json_str_omitempty, Target_shim_libs, $(subst $(space),:,$(TARGET_LD_SHIM_LIBS)))

$(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),,true))

$(call add_json_bool, Uses_metadata_as_fde_key, $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))

$(call add_json_bool, Uses_nvidia_enhancements, $(filter TRUE,$(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)))

$(call add_json_bool, Uses_qcom_bsp_legacy, $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)))

$(call add_json_bool, Uses_qti_camera_device, $(filter true,$(TARGET_USES_QTI_CAMERA_DEVICE)))