commit 77e0d86f26ff8c1534cde8892a4b8922e25b4e91
author Tianjie Xu <xunchang@google.com> Tue May 18 02:10:02 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 18 02:10:02 2021 +0000
tree 4334f99f30d9d87497432bd90eeb67ddb676d77a
parent 5b77e84a6d7b47bca60bff537ed633a6af05e11f
parent 2e1f5271c5fb7322daeebb28d25d8bfe1057a012

Merge "When checking if mke2fs is used, compare using basename"

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 2492da9..13c5363 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -283,7 +283,7 @@
     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: