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

Commit f301d211 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "build_image: Query the actual image size after invoking the final... 

Merge "build_image: Query the actual image size after invoking the final mkfs." am: 0096a750 am: 965ca0d9

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

Change-Id: I57810153d176b5f7ea034eafefa4d56275ceaed1
parents 2acb9ac6 965ca0d9

tools/releasetools/build_image.py

+4 −0
Original line number Diff line number Diff line
@@ -651,6 +651,10 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 
  if not mkfs_output:

    mkfs_output = BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config)



  # Update the image (eg filesystem size). This can be different eg if mkfs

  # rounds the requested size down due to alignment.

  prop_dict["image_size"] = common.sparse_img.GetImagePartitionSize(out_file)



  # Check if there's enough headroom space available for ext4 image.

  if "partition_headroom" in prop_dict and fs_type.startswith("ext4"):

    CheckHeadroom(mkfs_output, prop_dict)