aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2019-01-15 14:33:50 -0600
committerGerrit Code Review2019-01-15 14:33:50 -0600
commitdb3c8985be5165d84ba7f15886827046340a1ecf (patch)
tree414888c55c89e8d8c64e8c88d20862b38ac12ed7
parentd878baceda3df5e6417ef26acb2c433e835692d2 (diff)
parent9f23b89273ec886462113bf62cf71b2dba6716a1 (diff)
downloadplatform-build-db3c8985be5165d84ba7f15886827046340a1ecf.tar.gz
platform-build-db3c8985be5165d84ba7f15886827046340a1ecf.tar.xz
platform-build-db3c8985be5165d84ba7f15886827046340a1ecf.zip
Merge changes I6457933a,I955aa0fa
* changes: Revert "Relax inode usage estimation slack for DAP right sizing" Revert "Increase slack for inode estimation algorithm"
-rwxr-xr-xtools/releasetools/build_image.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 521b319ed..6aaff6bfa 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -75,8 +75,8 @@ def GetInodeUsage(path):
75 """ 75 """
76 cmd = ["find", path, "-print"] 76 cmd = ["find", path, "-print"]
77 output = common.RunAndCheckOutput(cmd, verbose=False) 77 output = common.RunAndCheckOutput(cmd, verbose=False)
78 # TODO(b/122328872) Fix estimation algorithm to not need the multiplier. 78 # increase by > 4% as number of files and directories is not whole picture.
79 return output.count('\n') * 2 79 return output.count('\n') * 25 // 24
80 80
81 81
82def GetFilesystemCharacteristics(image_path, sparse_image=True): 82def GetFilesystemCharacteristics(image_path, sparse_image=True):