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

Commit d29e5371 authored by David Anderson's avatar David Anderson
Browse files

Add blocklist support for EROFS. 

This also fixes argument ordering for mkerofsimage.sh.

Bug: 201685920
Test: build OTA with erofs
Change-Id: Ic2ba794e37a0feb73a1028eb7522d35bffbf3af6
parent 271dab6c

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])