StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "build_image: Query the actual image size after invoking the final mkfs." am: 0096a750c2 am: 965ca0d965 am: f301d211d8

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

Change-Id: I755ca7259857d6d5a0ed5fd6d07472b18812d9b7
This commit is contained in:
David Anderson
2021-12-01 04:17:34 +00:00
committed by Automerger Merge Worker
parent c6301ef5c4 f301d211d8
commit 161afa9b6a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/build_image.py
View File

@@ -651,6 +651,10 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
if not mkfs_output: if not mkfs_output:
mkfs_output = BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config) 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. # Check if there's enough headroom space available for ext4 image.
if "partition_headroom" in prop_dict and fs_type.startswith("ext4"): if "partition_headroom" in prop_dict and fs_type.startswith("ext4"):
CheckHeadroom(mkfs_output, prop_dict) CheckHeadroom(mkfs_output, prop_dict)