From d29e5371e1638723c1a31f8cc4d8ca7dc3dde918 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 8 Oct 2021 18:33:43 -0700 Subject: [PATCH] Add blocklist support for EROFS. This also fixes argument ordering for mkerofsimage.sh. Bug: 201685920 Test: build OTA with erofs Change-Id: Ic2ba794e37a0feb73a1028eb7522d35bffbf3af6 --- tools/releasetools/build_image.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 0e5ed12075..d2536f1dd0 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -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])