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

Commit 0f1131ce authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "When checking if mke2fs is used, compare using basename" am: 77e0d86f 

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

Change-Id: I4c38eec6445fb491ba1521eea4e65808256059e4
parents 6493a232 77e0d86f

tools/releasetools/build_image.py

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
    if "flash_logical_block_size" in prop_dict:

      build_command.extend(["-o", prop_dict["flash_logical_block_size"]])

    # Specify UUID and hash_seed if using mke2fs.

    if prop_dict["ext_mkuserimg"] == "mkuserimg_mke2fs":

    if os.path.basename(prop_dict["ext_mkuserimg"]) == "mkuserimg_mke2fs":

      if "uuid" in prop_dict:

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

      if "hash_seed" in prop_dict: