PWN-Hunter/android_build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build_image: get squashfs partition size from image size

Browse Source 
Just like erofs, we should used the compressed image's size to calculate
partition size, not the input directory's size.

Change-Id: I46d6dfa59cd7e8a02c349f026b1fd10be3fec587
This commit is contained in:
jabashque 2022-11-07 20:34:04 +00:00 committed by Pranav Vashi
parent f3cd6dc302
commit fbe328a9db
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/build_image.py
View File

@ -554,10 +554,15 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
"partition_size" not in prop_dict):
# If partition_size is not defined, use output of `du' + reserved_size.
# For compressed file system, it's better to use the compressed size to avoid wasting space.
if fs_type.startswith("erofs"):
if fs_type.startswith("erofs") or fs_type.startswith("squash"):
mkfs_output = BuildImageMkfs(
in_dir, prop_dict, out_file, target_out, fs_config)
if "erofs_sparse_flag" in prop_dict and not disable_sparse:
sparse_flag = False
if fs_type.startswith("erofs") and "erofs_sparse_flag" in prop_dict:
sparse_flag = True
if fs_type.startswith("squash") and "squashfs_sparse_flag" in prop_dict:
sparse_flag = True
if sparse_flag and not disable_sparse:
image_path = UnsparseImage(out_file, replace=False)
size = GetDiskUsage(image_path)
os.remove(image_path)