StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ext4 size estimates" into main am: 1cc902690e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2924814

Change-Id: I307e0853ab1298b9260c4f567f035509b9c06d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-29 20:09:40 +00:00
committed by Automerger Merge Worker
parent fa24950134 1cc902690e
commit e297eca95a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/build_image.py
View File

@@ -260,7 +260,7 @@ def CalculateSizeAndReserved(prop_dict, size):
if fs_type.startswith("ext4") and partition_headroom > reserved_size: if fs_type.startswith("ext4") and partition_headroom > reserved_size:
reserved_size = partition_headroom reserved_size = partition_headroom
return size + reserved_size return int(size * 1.1) + reserved_size
def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config):
@@ -636,7 +636,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
size = verity_image_builder.CalculateDynamicPartitionSize(size) size = verity_image_builder.CalculateDynamicPartitionSize(size)
prop_dict["partition_size"] = str(size) prop_dict["partition_size"] = str(size)
logger.info( logger.info(
"Allocating %d MB for %s.", size // BYTES_IN_MB, out_file) "Allocating %d MB for %s", size // BYTES_IN_MB, out_file)
prop_dict["image_size"] = prop_dict["partition_size"] prop_dict["image_size"] = prop_dict["partition_size"]
@@ -979,7 +979,11 @@ def main(argv):
parser.add_argument("target_out", parser.add_argument("target_out",
help="the path to $(TARGET_OUT). Certain tools will use this to look through multiple staging " help="the path to $(TARGET_OUT). Certain tools will use this to look through multiple staging "
"directories for fs config files.") "directories for fs config files.")
parser.add_argument("-v", action="store_true",
help="Enable verbose logging", dest="verbose")
args = parser.parse_args() args = parser.parse_args()
if args.verbose:
OPTIONS.verbose = True
common.InitLogging() common.InitLogging()