Merge "Rebuild recovery-from-boot patch when calling add_img_to_target_files." am: e55c0ae469 (41376712) · Commits · e / os / android_build

core/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -4171,8 +4171,9 @@ ifneq ($(BOARD_SUPER_PARTITION_GROUPS),)
		$(if $(_group_partition_list), \
		echo "$(group)_partition_list=$(_group_partition_list)" >> $(zip_root)/META/dynamic_partitions_info.txt;))
		endif # BOARD_SUPER_PARTITION_GROUPS
		@# TODO(b/134525174): Remove `-r` after addressing the issue with recovery patch generation.
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
		build/make/tools/releasetools/add_img_to_target_files -a -v -p $(HOST_OUT) $(zip_root)
		build/make/tools/releasetools/add_img_to_target_files -a -r -v -p $(HOST_OUT) $(zip_root)
		@# Zip everything up, preserving symlinks and placing META/ files first to
		@# help early validation of the .zip file while uploading it.
		$(hide) find $(zip_root)/META \| sort >$@.list

+4 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,8 @@ Usage: add_img_to_target_files [flag] target_files

		-r (--rebuild_recovery)
		Rebuild the recovery patch and write it to the system image. Only
		meaningful when system image needs to be rebuilt.
		meaningful when system image needs to be rebuilt and there're separate
		boot / recovery images.

		--replace_verity_private_key
		Replace the private key used for verity signing. (same as the option
		@@ -164,7 +165,8 @@ def AddSystem(output_zip, recovery_img=None, boot_img=None):
		else:
		common.ZipWrite(output_zip, ofile.name, arc_name)

		if OPTIONS.rebuild_recovery:
		if (OPTIONS.rebuild_recovery and recovery_img is not None and
		boot_img is not None):
		logger.info("Building new recovery patch")
		common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, recovery_img,
		boot_img, info_dict=OPTIONS.info_dict)