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

Commit 29c06288 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Add blocklist support for EROFS." am: fce20c24 am: 8e160622 am:... 

Merge "Add blocklist support for EROFS." am: fce20c24 am: 8e160622 am: bf5fa4b0 am: 152428b1

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

Change-Id: Ic4a4bd0b8adde8a2b34f192e0e72479c77ea8eb9
parents 4d01a49b 152428b1

tools/releasetools/build_image.py

+6 −4
Original line number Diff line number Diff line
@@ -330,10 +330,6 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
      build_command.extend(["-C", fs_config])

    if "selinux_fc" in prop_dict:

      build_command.extend(["-c", prop_dict["selinux_fc"]])

    if "timestamp" in prop_dict:

      build_command.extend(["-T", str(prop_dict["timestamp"])])

    if "uuid" in prop_dict:

      build_command.extend(["-U", prop_dict["uuid"]])

    compressor = None

    if "erofs_default_compressor" in prop_dict:

      compressor = prop_dict["erofs_default_compressor"]
@@ -341,6 +337,12 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
      compressor = prop_dict["erofs_compressor"]

    if compressor:

      build_command.extend(["-z", compressor])

    if "timestamp" in prop_dict:

      build_command.extend(["-T", str(prop_dict["timestamp"])])

    if "uuid" in prop_dict:

      build_command.extend(["-U", prop_dict["uuid"]])

    if "block_list" in prop_dict:

      build_command.extend(["-B", prop_dict["block_list"]])

  elif fs_type.startswith("squash"):

    build_command = ["mksquashfsimage.sh"]

    build_command.extend([in_dir, out_file])