p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Avoid to print undefined image_size and partition_size" am: 34949e63da am: 615815655b am: 4a3c54921f 

Original change: https://android-review.googlesource.com/c/platform/build/+/1688189

Change-Id: I5bbf61a406ec1ecc56f216c759ccd7b13f6b0a37
This commit is contained in:
Treehugger Robot 2021-05-01 04:46:45 +00:00 committed by Automerger Merge Worker
parent 1d28f84dfe 4a3c54921f
commit e8cefbb3d8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/releasetools/build_image.py
View File

@ -386,13 +386,14 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config):
in_dir, du_str,
int(prop_dict.get("partition_reserved_size", 0)),
int(prop_dict.get("partition_reserved_size", 0)) // BYTES_IN_MB))
print(
"The max image size for filesystem files is {} bytes ({} MB), out of a "
"total partition size of {} bytes ({} MB).".format(
int(prop_dict["image_size"]),
int(prop_dict["image_size"]) // BYTES_IN_MB,
int(prop_dict["partition_size"]),
int(prop_dict["partition_size"]) // BYTES_IN_MB))
if ("image_size" in prop_dict and "partition_size" in prop_dict):
print(
"The max image size for filesystem files is {} bytes ({} MB), "
"out of a total partition size of {} bytes ({} MB).".format(
int(prop_dict["image_size"]),
int(prop_dict["image_size"]) // BYTES_IN_MB,
int(prop_dict["partition_size"]),
int(prop_dict["partition_size"]) // BYTES_IN_MB))
raise
if run_e2fsck and prop_dict.get("skip_fsck") != "true":