diff options
| author | Anton Hansson | 2018-11-07 07:55:34 -0600 |
|---|---|---|
| committer | Anton Hansson | 2018-11-07 08:02:42 -0600 |
| commit | 0e60f8a42c086beac385133e8545919ae008cc9a (patch) | |
| tree | a74877a6120e09a18da3cb83865e037feb81bbab /tools/releasetools | |
| parent | fcc971934bdac9a397ff78e1e09dd8ab2a0936cc (diff) | |
| download | platform-build-0e60f8a42c086beac385133e8545919ae008cc9a.tar.gz platform-build-0e60f8a42c086beac385133e8545919ae008cc9a.tar.xz platform-build-0e60f8a42c086beac385133e8545919ae008cc9a.zip | |
Make right-sizing less aggressive
This is a rollback of Id5ae6645b9aa2d036e6fefe2fb17672e8f8ef6f0
and the followup I6a0f3919e8d45d0b3e7cd558a6ad4d3799012f2c
The magic constant introduced appears to be too aggressive.
Note that the new constant in I0f32c75e80b5da4d47671055ac274ccc2b485992
doesn't appear to fix the broken builds.
Bug: 111302946
Test: make
Change-Id: I29207265172d293c6fee98212e3266bde85895df
Diffstat (limited to 'tools/releasetools')
| -rwxr-xr-x | tools/releasetools/build_image.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 0aeadaf55..c3701a860 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): | |||
| 281 | logger.info( | 281 | logger.info( |
| 282 | "Not worth reducing image %d <= %d.", free_size, reserved_size) | 282 | "Not worth reducing image %d <= %d.", free_size, reserved_size) |
| 283 | else: | 283 | else: |
| 284 | size -= free_size + (free_size // 61) | 284 | size -= free_size |
| 285 | size += reserved_size | 285 | size += reserved_size |
| 286 | if block_size <= 4096: | 286 | if block_size <= 4096: |
| 287 | size = common.RoundUpTo4K(size) | 287 | size = common.RoundUpTo4K(size) |