OSDN Git Service

Retry adjusting the size computation for reserved blocks.
authorTao Bao <tbao@google.com>
Tue, 23 Jun 2015 18:16:05 +0000 (11:16 -0700)
committerTao Bao <tbao@google.com>
Tue, 30 Jun 2015 19:17:28 +0000 (12:17 -0700)
commit4e66343b2b28ac249214c9f5cb5de936f0f209ad
tree217f959b1b1f04bceb654734fe06f98c337ed660
parent5df6b5c3463bc8715510320beb7833c45371e021
Retry adjusting the size computation for reserved blocks.

Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e692283be32069e808b88522727c7fe98.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: Iaae6507f6de68a5892f2e3035d330039287b4492
(cherry picked from commit c7a6f1e4f8ff504bf617a0415b2c43ab3d339294)
core/Makefile
tools/releasetools/build_image.py