From 2b191894c29284cf52633bd68126a0e0bffa00b5 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 5 Nov 2018 08:31:29 -0800 Subject: [PATCH] build_image still too aggressive with right sizing (part troix) Regression introduced by c3d408e3c180327bfbc88e9147e25bb793071bf6 Found a case where 1 + 1/60 reduction in size based on free space failed when right sizing an ext4 image. Reduced the math to 1 + 1/61. Test: compile Bug: 111302946 Change-Id: I0f32c75e80b5da4d47671055ac274ccc2b485992 --- tools/releasetools/build_image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 6d2269440e..0aeadaf553 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -281,7 +281,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): logger.info( "Not worth reducing image %d <= %d.", free_size, reserved_size) else: - size -= free_size + (free_size // 60) + size -= free_size + (free_size // 61) size += reserved_size if block_size <= 4096: size = common.RoundUpTo4K(size)