Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 472eef4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid to print undefined image_size and partition_size" am: 34949e63... 

Merge "Avoid to print undefined image_size and partition_size" am: 34949e63 am: 61581565 am: 4a3c5492 am: e8cefbb3

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

Change-Id: I28fe053a44fd3ea13bb67d9b6f0838dc0e485c42
parents e8d13f1e e8cefbb3

tools/releasetools/build_image.py

+8 −7
Original line number Diff line number Diff line
@@ -386,9 +386,10 @@ 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))

    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(

          "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"]),