commit 2b191894c29284cf52633bd68126a0e0bffa00b5
author Mark Salyzyn <salyzyn@google.com> Mon Nov 05 08:31:29 2018 -0800
committer Mark Salyzyn <salyzyn@google.com> Tue Nov 06 15:57:03 2018 -0800
tree d938f8123596a58a10b21d801f2f86baeb0a80a3
parent d0b9758203d2ff66059fcd60fa5bf53078a773ef

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

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 6d22694..0aeadaf 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -281,7 +281,7 @@
         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)