Add options to sign the prebuilt custom images. am: d9edddd64d (368dab01) · Commits · e / os / android_build

core/Makefile

+73 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3309,6 +3309,41 @@ define images-for-partitions
	$(strip $(foreach item,$(1),$(INSTALLED_$(call to-upper,$(item))IMAGE_TARGET)))		$(strip $(foreach item,$(1),$(INSTALLED_$(call to-upper,$(item))IMAGE_TARGET)))
	endef		endef

			# -----------------------------------------------------------------
			# custom images
			INSTALLED_CUSTOMIMAGES_TARGET :=

			ifneq ($(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)),)
			INTERNAL_AVB_CUSTOMIMAGES_SIGNING_ARGS :=

			# Sign custom image.
			# $(1): the prebuilt custom image.
			# $(2): the mount point of the prebuilt custom image.
			# $(3): the signed custom image target.
			define sign_custom_image
			$(3): $(1) $(INTERNAL_USERIMAGES_DEPS)
			@echo Target custom image: $(3)
			mkdir -p $(dir $(3))
			cp $(1) $(3)
			ifeq ($(BOARD_AVB_ENABLE),true)
			PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$$$PATH \
			$(AVBTOOL) add_hashtree_footer \
			--image $(3) \
			--key $(BOARD_AVB_$(call to-upper,$(2))_KEY_PATH) \
			--algorithm $(BOARD_AVB_$(call to-upper,$(2))_ALGORITHM) \
			--partition_size $(BOARD_AVB_$(call to-upper,$(2))_PARTITION_SIZE) \
			--partition_name $(2) \
			$(INTERNAL_AVB_CUSTOMIMAGES_SIGNING_ARGS) \
			$(BOARD_AVB_$(call to-upper,$(2))_ADD_HASHTREE_FOOTER_ARGS)
			endif
			INSTALLED_CUSTOMIMAGES_TARGET += $(3)
			endef

			$(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \
			$(foreach image,$(BOARD_AVB_$(call to-upper,$(partition))_IMAGE_LIST), \
			$(eval $(call sign_custom_image,$(image),$(partition),$(PRODUCT_OUT)/$(notdir $(image))))))
			endif

	# -----------------------------------------------------------------		# -----------------------------------------------------------------
	# vbmeta image		# vbmeta image
	ifeq ($(BOARD_AVB_ENABLE),true)		ifeq ($(BOARD_AVB_ENABLE),true)
	@@ -3480,6 +3515,18 @@ $(if $(BOARD_AVB_$(call to-upper,$(1))_KEY_PATH),\
	--include_descriptors_from_image $(call images-for-partitions,$(1)))))		--include_descriptors_from_image $(call images-for-partitions,$(1)))))
	endef		endef

			# Checks and sets build variables for a custom chained partition to include it into vbmeta.img.
			# $(1): the custom partition to enable AVB chain.
			define check-and-set-custom-avb-chain-args
			$(eval part := $(1))
			$(eval PART=$(call to-upper,$(part)))
			$(eval _rollback_index_location := BOARD_AVB_$(PART)_ROLLBACK_INDEX_LOCATION)
			$(if $($(_rollback_index_location)),,$(error $(_rollback_index_location) is not defined))

			INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \
			--chain_partition $(part):$($(_rollback_index_location)):$(AVB_CHAIN_KEY_DIR)/$(part).avbpubkey
			endef

	ifdef INSTALLED_BOOTIMAGE_TARGET		ifdef INSTALLED_BOOTIMAGE_TARGET
	$(eval $(call check-and-set-avb-args,boot))		$(eval $(call check-and-set-avb-args,boot))
	endif		endif
	@@ -3523,6 +3570,11 @@ ifdef BOARD_AVB_VBMETA_VENDOR
	$(eval $(call check-and-set-avb-args,vbmeta_vendor))		$(eval $(call check-and-set-avb-args,vbmeta_vendor))
	endif		endif

			ifneq ($(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)),)
			$(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \
			$(eval $(call check-and-set-custom-avb-chain-args,$(partition))))
			endif

	# Add kernel cmdline descriptor for kernel to mount system.img as root with		# Add kernel cmdline descriptor for kernel to mount system.img as root with
	# dm-verity. This works when system.img is either chained or not-chained:		# dm-verity. This works when system.img is either chained or not-chained:
	# - chained: The --setup_as_rootfs_from_kernel option will add dm-verity kernel		# - chained: The --setup_as_rootfs_from_kernel option will add dm-verity kernel
	@@ -3593,6 +3645,10 @@ define extract-avb-chain-public-keys
	$(if $(BOARD_AVB_VBMETA_VENDOR_KEY_PATH),\		$(if $(BOARD_AVB_VBMETA_VENDOR_KEY_PATH),\
	$(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_VBMETA_VENDOR_KEY_PATH) \		$(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_VBMETA_VENDOR_KEY_PATH) \
	--output $(1)/vbmeta_vendor.avbpubkey)		--output $(1)/vbmeta_vendor.avbpubkey)
			$(if $(BOARD_CUSTOMIMAGES_PARTITION_LIST),\
			$(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \
			$(AVBTOOL) extract_public_key --key $(BOARD_AVB_$(call to-upper,$(partition))_KEY_PATH) \
			--output $(1)/$(partition).avbpubkey;))
	endef		endef

	# Builds a chained VBMeta image. This VBMeta image will contain the descriptors for the partitions		# Builds a chained VBMeta image. This VBMeta image will contain the descriptors for the partitions
	@@ -3660,6 +3716,7 @@ $(INSTALLED_VBMETAIMAGE_TARGET): \
	$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \		$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \
	$(INSTALLED_ODMIMAGE_TARGET) \		$(INSTALLED_ODMIMAGE_TARGET) \
	$(INSTALLED_DTBOIMAGE_TARGET) \		$(INSTALLED_DTBOIMAGE_TARGET) \
			$(INSTALLED_CUSTOMIMAGES_TARGET) \
	$(INSTALLED_RECOVERYIMAGE_TARGET) \		$(INSTALLED_RECOVERYIMAGE_TARGET) \
	$(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET) \		$(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET) \
	$(INSTALLED_VBMETA_VENDORIMAGE_TARGET) \		$(INSTALLED_VBMETA_VENDORIMAGE_TARGET) \
	@@ -4218,6 +4275,16 @@ ifdef BOARD_AVB_RECOVERY_KEY_PATH
	$(hide) echo "avb_recovery_algorithm=$(BOARD_AVB_RECOVERY_ALGORITHM)" >> $@		$(hide) echo "avb_recovery_algorithm=$(BOARD_AVB_RECOVERY_ALGORITHM)" >> $@
	$(hide) echo "avb_recovery_rollback_index_location=$(BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION)" >> $@		$(hide) echo "avb_recovery_rollback_index_location=$(BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION)" >> $@
	endif # BOARD_AVB_RECOVERY_KEY_PATH		endif # BOARD_AVB_RECOVERY_KEY_PATH
			ifneq (,$(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)))
			$(hide) echo "avb_custom_images_partition_list=$(BOARD_CUSTOMIMAGES_PARTITION_LIST)" >> $@
			$(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \
			echo "avb_$(partition)_key_path=$(BOARD_AVB_$(call to-upper,$(partition))_KEY_PATH)" >> $@; \
			echo "avb_$(partition)_algorithm=$(BOARD_AVB_$(call to-upper,$(partition))_ALGORITHM)" >> $@; \
			echo "avb_$(partition)_add_hashtree_footer_args=$(BOARD_AVB_$(call to-upper,$(partition))_ADD_HASHTREE_FOOTER_ARGS)" >> $@; \
			echo "avb_$(partition)_rollback_index_location=$(BOARD_AVB_$(call to-upper,$(partition))_ROLLBACK_INDEX_LOCATION)" >> $@; \
			echo "avb_$(partition)_partition_size=$(BOARD_AVB_$(call to-upper,$(partition))_PARTITION_SIZE)" >> $@; \
			echo "avb_$(partition)_image_list=$(foreach image,$(BOARD_AVB_$(call to-upper,$(partition))_IMAGE_LIST),$(notdir $(image)))" >> $@;)
			endif # BOARD_CUSTOMIMAGES_PARTITION_LIST
	ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))		ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))
	$(hide) echo "avb_vbmeta_system=$(BOARD_AVB_VBMETA_SYSTEM)" >> $@		$(hide) echo "avb_vbmeta_system=$(BOARD_AVB_VBMETA_SYSTEM)" >> $@
	$(hide) echo "avb_vbmeta_system_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $@		$(hide) echo "avb_vbmeta_system_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $@
	@@ -4451,6 +4518,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
	$(INSTALLED_VBMETAIMAGE_TARGET) \		$(INSTALLED_VBMETAIMAGE_TARGET) \
	$(INSTALLED_ODMIMAGE_TARGET) \		$(INSTALLED_ODMIMAGE_TARGET) \
	$(INSTALLED_DTBOIMAGE_TARGET) \		$(INSTALLED_DTBOIMAGE_TARGET) \
			$(INSTALLED_CUSTOMIMAGES_TARGET) \
	$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \		$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \
	$(INSTALLED_ANDROID_INFO_TXT_TARGET) \		$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
	$(INSTALLED_KERNEL_TARGET) \		$(INSTALLED_KERNEL_TARGET) \
	@@ -4695,6 +4763,11 @@ ifdef BOARD_PREBUILT_DTBOIMAGE
	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES		$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
	$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/		$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
	endif # BOARD_PREBUILT_DTBOIMAGE		endif # BOARD_PREBUILT_DTBOIMAGE
			ifneq ($(strip $(BOARD_CUSTOMIMAGES_PARTITION_LIST)),)
			$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
			$(hide) $(foreach partition,$(BOARD_CUSTOMIMAGES_PARTITION_LIST), \
			$(foreach image,$(BOARD_AVB_$(call to-upper,$(partition))_IMAGE_LIST),cp $(image) $(zip_root)/PREBUILT_IMAGES/;))
			endif # BOARD_CUSTOMIMAGES_PARTITION_LIST
	@# The radio images in BOARD_PACK_RADIOIMAGES will be additionally copied from RADIO/ into		@# The radio images in BOARD_PACK_RADIOIMAGES will be additionally copied from RADIO/ into
	@# IMAGES/, which then will be added into <product>-img.zip. Such images must be listed in		@# IMAGES/, which then will be added into <product>-img.zip. Such images must be listed in
	@# INSTALLED_RADIOIMAGE_TARGET.		@# INSTALLED_RADIOIMAGE_TARGET.

tools/releasetools/add_img_to_target_files.py

+64 −3

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,7 @@ import build_super_image
	import common		import common
	import rangelib		import rangelib
	import sparse_img		import sparse_img
			import verity_utils

	if sys.hexversion < 0x02070000:		if sys.hexversion < 0x02070000:
	print("Python 2.7 or newer is required.", file=sys.stderr)		print("Python 2.7 or newer is required.", file=sys.stderr)
	@@ -312,6 +313,56 @@ def AddDtbo(output_zip):
	img.Write()		img.Write()
	return img.name		return img.name

			def AddCustomImages(output_zip, partition_name):
			"""Adds and signs custom images in IMAGES/.

			Args:
			output_zip: The output zip file (needs to be already open), or None to
			write images to OPTIONS.input_tmp/.

			Uses the image under IMAGES/ if it already exists. Otherwise looks for the
			image under PREBUILT_IMAGES/, signs it as needed, and returns the image name.

			Raises:
			AssertionError: If image can't be found.
			"""

			partition_size = OPTIONS.info_dict.get(
			"avb_{}_partition_size".format(partition_name))
			key_path = OPTIONS.info_dict.get("avb_{}_key_path".format(partition_name))
			algorithm = OPTIONS.info_dict.get("avb_{}_algorithm".format(partition_name))
			extra_args = OPTIONS.info_dict.get(
			"avb_{}_add_hashtree_footer_args".format(partition_name))
			partition_size = OPTIONS.info_dict.get(
			"avb_{}_partition_size".format(partition_name))

			builder = verity_utils.CreateCustomImageBuilder(
			OPTIONS.info_dict, partition_name, partition_size,
			key_path, algorithm, extra_args)

			for img_name in OPTIONS.info_dict.get(
			"avb_{}_image_list".format(partition_name)).split():
			custom_image = OutputFile(output_zip, OPTIONS.input_tmp, "IMAGES", img_name)
			if os.path.exists(custom_image.name):
			continue

			custom_image_prebuilt_path = os.path.join(
			OPTIONS.input_tmp, "PREBUILT_IMAGES", img_name)
			assert os.path.exists(custom_image_prebuilt_path), \
			"Failed to find %s at %s" % (img_name, custom_image_prebuilt_path)

			shutil.copy(custom_image_prebuilt_path, custom_image.name)

			if builder is not None:
			builder.Build(custom_image.name)

			custom_image.Write()

			default = os.path.join(OPTIONS.input_tmp, "IMAGES", partition_name + ".img")
			assert os.path.exists(default), \
			"There should be one %s.img" % (partition_name)
			return default


	def CreateImage(input_dir, info_dict, what, output_file, block_list=None):		def CreateImage(input_dir, info_dict, what, output_file, block_list=None):
	logger.info("creating %s.img...", what)		logger.info("creating %s.img...", what)
	@@ -411,8 +462,9 @@ def AddVBMeta(output_zip, partitions, name, needed_partitions):
	Args:		Args:
	output_zip: The output zip file, which needs to be already open.		output_zip: The output zip file, which needs to be already open.
	partitions: A dict that's keyed by partition names with image paths as		partitions: A dict that's keyed by partition names with image paths as
	values. Only valid partition names are accepted, as listed in		values. Only valid partition names are accepted, as partitions listed
	common.AVB_PARTITIONS.		in common.AVB_PARTITIONS and custom partitions listed in
			OPTIONS.info_dict.get("avb_custom_images_partition_list")
	name: Name of the VBMeta partition, e.g. 'vbmeta', 'vbmeta_system'.		name: Name of the VBMeta partition, e.g. 'vbmeta', 'vbmeta_system'.
	needed_partitions: Partitions whose descriptors should be included into the		needed_partitions: Partitions whose descriptors should be included into the
	generated VBMeta image.		generated VBMeta image.
	@@ -829,11 +881,20 @@ def AddImagesToTargetFiles(filename):
	banner("dtbo")		banner("dtbo")
	partitions['dtbo'] = AddDtbo(output_zip)		partitions['dtbo'] = AddDtbo(output_zip)

			# Custom images.
			custom_partitions = OPTIONS.info_dict.get(
			"avb_custom_images_partition_list", "").strip().split()
			for partition_name in custom_partitions:
			partition_name = partition_name.strip()
			banner("custom images for " + partition_name)
			partitions[partition_name] = AddCustomImages(output_zip, partition_name)

	if OPTIONS.info_dict.get("avb_enable") == "true":		if OPTIONS.info_dict.get("avb_enable") == "true":
	# vbmeta_partitions includes the partitions that should be included into		# vbmeta_partitions includes the partitions that should be included into
	# top-level vbmeta.img, which are the ones that are not included in any		# top-level vbmeta.img, which are the ones that are not included in any
	# chained VBMeta image plus the chained VBMeta images themselves.		# chained VBMeta image plus the chained VBMeta images themselves.
	vbmeta_partitions = common.AVB_PARTITIONS[:]		# Currently custom_partitions are all chained to VBMeta image.
			vbmeta_partitions = common.AVB_PARTITIONS[:] + tuple(custom_partitions)

	vbmeta_system = OPTIONS.info_dict.get("avb_vbmeta_system", "").strip()		vbmeta_system = OPTIONS.info_dict.get("avb_vbmeta_system", "").strip()
	if vbmeta_system:		if vbmeta_system:

tools/releasetools/common.py

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -978,8 +978,9 @@ def BuildVBMeta(image_path, partitions, name, needed_partitions):
	Args:		Args:
	image_path: The output path for the new VBMeta image.		image_path: The output path for the new VBMeta image.
	partitions: A dict that's keyed by partition names with image paths as		partitions: A dict that's keyed by partition names with image paths as
	values. Only valid partition names are accepted, as listed in		values. Only valid partition names are accepted, as partitions listed
	common.AVB_PARTITIONS.		in common.AVB_PARTITIONS and custom partitions listed in
			OPTIONS.info_dict.get("avb_custom_images_partition_list")
	name: Name of the VBMeta partition, e.g. 'vbmeta', 'vbmeta_system'.		name: Name of the VBMeta partition, e.g. 'vbmeta', 'vbmeta_system'.
	needed_partitions: Partitions whose descriptors should be included into the		needed_partitions: Partitions whose descriptors should be included into the
	generated VBMeta image.		generated VBMeta image.
	@@ -991,11 +992,15 @@ def BuildVBMeta(image_path, partitions, name, needed_partitions):
	cmd = [avbtool, "make_vbmeta_image", "--output", image_path]		cmd = [avbtool, "make_vbmeta_image", "--output", image_path]
	AppendAVBSigningArgs(cmd, name)		AppendAVBSigningArgs(cmd, name)

			custom_partitions = OPTIONS.info_dict.get(
			"avb_custom_images_partition_list", "").strip().split()

	for partition, path in partitions.items():		for partition, path in partitions.items():
	if partition not in needed_partitions:		if partition not in needed_partitions:
	continue		continue
	assert (partition in AVB_PARTITIONS or		assert (partition in AVB_PARTITIONS or
	partition in AVB_VBMETA_PARTITIONS), \		partition in AVB_VBMETA_PARTITIONS or
			partition in custom_partitions), \
	'Unknown partition: {}'.format(partition)		'Unknown partition: {}'.format(partition)
	assert os.path.exists(path), \		assert os.path.exists(path), \
	'Failed to find {} for {}'.format(path, partition)		'Failed to find {} for {}'.format(path, partition)

tools/releasetools/sign_target_files_apks.py

+32 −1

Original line number	Original line	Diff line number	Diff line
	@@ -112,6 +112,17 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files
	(e.g. "--signing_helper /path/to/helper"). The args will be appended to		(e.g. "--signing_helper /path/to/helper"). The args will be appended to
	the existing ones in info dict.		the existing ones in info dict.

			--avb_extra_custom_image_key <partition=key>
			--avb_extra_custom_image_algorithm <partition=algorithm>
			Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign
			the specified custom images mounted on the partition. Otherwise it uses
			the existing values in info dict.

			--avb_extra_custom_image_extra_args <partition=extra_args>
			Specify any additional args that are needed to AVB-sign the custom images
			mounted on the partition (e.g. "--signing_helper /path/to/helper"). The
			args will be appended to the existing ones in info dict.

	--android_jar_path <path>		--android_jar_path <path>
	Path to the android.jar to repack the apex file.		Path to the android.jar to repack the apex file.
	"""		"""
	@@ -956,12 +967,20 @@ def ReplaceAvbSigningKeys(misc_info):
	if extra_args:		if extra_args:
	print('Setting extra AVB signing args for %s to "%s"' % (		print('Setting extra AVB signing args for %s to "%s"' % (
	partition, extra_args))		partition, extra_args))
			if partition in AVB_FOOTER_ARGS_BY_PARTITION:
	args_key = AVB_FOOTER_ARGS_BY_PARTITION[partition]		args_key = AVB_FOOTER_ARGS_BY_PARTITION[partition]
			else:
			# custom partition
			args_key = "avb_{}_add_hashtree_footer_args".format(partition)
	misc_info[args_key] = (misc_info.get(args_key, '') + ' ' + extra_args)		misc_info[args_key] = (misc_info.get(args_key, '') + ' ' + extra_args)

	for partition in AVB_FOOTER_ARGS_BY_PARTITION:		for partition in AVB_FOOTER_ARGS_BY_PARTITION:
	ReplaceAvbPartitionSigningKey(partition)		ReplaceAvbPartitionSigningKey(partition)

			for custom_partition in misc_info.get(
			"avb_custom_images_partition_list", "").strip().split():
			ReplaceAvbPartitionSigningKey(custom_partition)


	def RewriteAvbProps(misc_info):		def RewriteAvbProps(misc_info):
	"""Rewrites the props in AVB signing args."""		"""Rewrites the props in AVB signing args."""
	@@ -1208,6 +1227,15 @@ def main(argv):
	OPTIONS.avb_extra_args['vbmeta_vendor'] = a		OPTIONS.avb_extra_args['vbmeta_vendor'] = a
	elif o == "--avb_apex_extra_args":		elif o == "--avb_apex_extra_args":
	OPTIONS.avb_extra_args['apex'] = a		OPTIONS.avb_extra_args['apex'] = a
			elif o == "--avb_extra_custom_image_key":
			partition, key = a.split("=")
			OPTIONS.avb_keys[partition] = key
			elif o == "--avb_extra_custom_image_algorithm":
			partition, algorithm = a.split("=")
			OPTIONS.avb_algorithms[partition] = algorithm
			elif o == "--avb_extra_custom_image_extra_args":
			partition, extra_args = a.split("=")
			OPTIONS.avb_extra_args[partition] = extra_args
	else:		else:
	return False		return False
	return True		return True
	@@ -1252,6 +1280,9 @@ def main(argv):
	"avb_vbmeta_vendor_algorithm=",		"avb_vbmeta_vendor_algorithm=",
	"avb_vbmeta_vendor_key=",		"avb_vbmeta_vendor_key=",
	"avb_vbmeta_vendor_extra_args=",		"avb_vbmeta_vendor_extra_args=",
			"avb_extra_custom_image_key=",
			"avb_extra_custom_image_algorithm=",
			"avb_extra_custom_image_extra_args=",
	],		],
	extra_option_handler=option_handler)		extra_option_handler=option_handler)

tools/releasetools/validate_target_files.py

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -352,8 +352,13 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options):
	cmd = [info_dict['avb_avbtool'], 'verify_image', '--image', image,		cmd = [info_dict['avb_avbtool'], 'verify_image', '--image', image,
	'--follow_chain_partitions']		'--follow_chain_partitions']

			# Custom images.
			custom_partitions = info_dict.get(
			"avb_custom_images_partition_list", "").strip().split()

	# Append the args for chained partitions if any.		# Append the args for chained partitions if any.
	for partition in common.AVB_PARTITIONS + common.AVB_VBMETA_PARTITIONS:		for partition in (common.AVB_PARTITIONS + common.AVB_VBMETA_PARTITIONS +
			tuple(custom_partitions)):
	key_name = 'avb_' + partition + '_key_path'		key_name = 'avb_' + partition + '_key_path'
	if info_dict.get(key_name) is not None:		if info_dict.get(key_name) is not None:
	if info_dict.get('ab_update') != 'true' and partition == 'recovery':		if info_dict.get('ab_update') != 'true' and partition == 'recovery':