Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e297eca9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I307e0853ab1298b9260c4f567f035509b9c06d3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa249501 1cc90269

tools/releasetools/build_image.py

+6 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ def CalculateSizeAndReserved(prop_dict, size): 
  if fs_type.startswith("ext4") and partition_headroom > reserved_size:

    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):
@@ -636,7 +636,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 
      size = verity_image_builder.CalculateDynamicPartitionSize(size)

    prop_dict["partition_size"] = str(size)

    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"]
@@ -979,7 +979,11 @@ def main(argv): 
  parser.add_argument("target_out",

    help="the path to $(TARGET_OUT). Certain tools will use this to look through multiple staging "

    "directories for fs config files.")

  parser.add_argument("-v", action="store_true",

                      help="Enable verbose logging", dest="verbose")

  args = parser.parse_args()

  if args.verbose:

    OPTIONS.verbose = True



  common.InitLogging()