Merge branch '1623-t-custom_scaler' into 'v2.1-t' (9016074e) · Commits · e / os / android_vendor_lineage

build/soong/Android.bp

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,23 @@ camera_override_format_from_reserved {
	},		},
	}		}

			soong_config_module_type {
			name: "camera_custom_scaler_configuration",
			module_type: "cc_defaults",
			config_namespace: "lineageGlobalVars",
			value_variables: ["camera_custom_scaler_configuration"],
			properties: ["cppflags"],
			}

			camera_custom_scaler_configuration {
			name: "camera_custom_scaler_configuration_defaults",
			soong_config_variables: {
			camera_custom_scaler_configuration: {
			cppflags: ["-DTARGET_CAMERA_CUSTOM_SCALER_CONFIGURATION=\"%s\""],
			},
			},
			}

	soong_config_module_type {		soong_config_module_type {
	name: "gralloc_10_usage_bits",		name: "gralloc_10_usage_bits",
	module_type: "cc_defaults",		module_type: "cc_defaults",

config/BoardConfigSoong.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ SOONG_CONFIG_lineageGlobalVars += \
	additional_gralloc_10_usage_bits \		additional_gralloc_10_usage_bits \
	bootloader_message_offset \		bootloader_message_offset \
	camera_override_format_from_reserved \		camera_override_format_from_reserved \
			camera_custom_scaler_configuration \
	force_render_engine_gen_textures \		force_render_engine_gen_textures \
	gralloc_handle_has_custom_content_md_reserved_size \		gralloc_handle_has_custom_content_md_reserved_size \
	gralloc_handle_has_reserved_size \		gralloc_handle_has_reserved_size \
	@@ -69,6 +70,7 @@ endif

	# Soong bool variables		# Soong bool variables
	SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED)		SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED)
			SOONG_CONFIG_lineageGlobalVars_camera_custom_scaler_configuration := $(TARGET_CAMERA_CUSTOM_SCALER_CONFIGURATION)
	SOONG_CONFIG_lineageGlobalVars_force_render_engine_gen_textures := $(TARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES)		SOONG_CONFIG_lineageGlobalVars_force_render_engine_gen_textures := $(TARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES)
	SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_custom_content_md_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE)		SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_custom_content_md_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE)
	SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE)		SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE)
	@@ -81,6 +83,7 @@ SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_P
	# Set default values		# Set default values
	BOOTLOADER_MESSAGE_OFFSET ?= 0		BOOTLOADER_MESSAGE_OFFSET ?= 0
	TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0		TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
			TARGET_CAMERA_CUSTOM_SCALER_CONFIGURATON ?= 0
	TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED ?= false		TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED ?= false
	TARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES ?= false		TARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES ?= false
	TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE ?= false		TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE ?= false