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

Commit ad7984ab authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 400f1723 dc5051ce

build/soong/android/variable.go

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

		Cflags []string

	}

	Target_omx_legacy_rescaling struct {

		Cppflags []string

	}

	Target_process_sdk_version_override struct {

		Cppflags []string

	}
@@ -81,6 +84,7 @@ type ProductVariables struct { 
	Supports_hw_fde  *bool `json:",omitempty"`

	Supports_hw_fde_perf  *bool `json:",omitempty"`

	Supports_legacy_hw_fde  *bool `json:",omitempty"`

	Target_omx_legacy_rescaling  *bool `json:",omitempty"`

	Target_process_sdk_version_override *string `json:",omitempty"`

	Target_shim_libs  *string `json:",omitempty"`

	Uses_generic_camera_parameter_library  *bool `json:",omitempty"`

build/soong/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ $(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA 
$(call add_json_bool, Supports_hw_fde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))

$(call add_json_bool, Supports_hw_fde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))

$(call add_json_bool, Supports_legacy_hw_fde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))

$(call add_json_bool, Target_omx_legacy_rescaling, $(filter true,$(TARGET_OMX_LEGACY_RESCALING)))

$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))

$(call add_json_str_omitempty, Target_shim_libs, $(TARGET_LD_SHIM_LIBS))

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