tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Adding better AVB error message"

Browse source
This commit is contained in:
Treehugger Robot 2018-09-06 07:45:34 +00:00 committed by Gerrit Code Review
commit 71034e3764
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Makefile
View file

@ -2645,10 +2645,6 @@ BOARD_AVB_ALGORITHM := SHA256_RSA4096
BOARD_AVB_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
endif
ifndef BOARD_BOOTIMAGE_PARTITION_SIZE
$(error BOARD_BOOTIMAGE_PARTITION_SIZE must be set for BOARD_AVB_ENABLE)
endif
BOOT_FOOTER_ARGS := BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS
DTBO_FOOTER_ARGS := BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS
SYSTEM_FOOTER_ARGS := BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS

10
tools/releasetools/build_image.py
View file

@ -197,8 +197,11 @@ def AVBAddFooter(image_path, avbtool, footer_type, partition_size,
cmd.extend(shlex.split(additional_args))
(_, exit_code) = RunCommand(cmd)
return exit_code == 0
output, exit_code = RunCommand(cmd)
if exit_code != 0:
print("Failed to add AVB footer! Error: %s" % output)
return False
return True
def AdjustPartitionSizeForVerity(partition_size, fec_supported):
@ -587,7 +590,8 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
additional_args = prop_dict["avb_add_" + avb_footer_type + "_footer_args"]
max_image_size = AVBCalcMaxImageSize(avbtool, avb_footer_type,
partition_size, additional_args)
if max_image_size == 0:
if max_image_size <= 0:
print("AVBCalcMaxImageSize is <= 0: %d" % max_image_size)
return False
prop_dict["partition_size"] = str(max_image_size)
prop_dict["original_partition_size"] = partition_size