Merge "Switch check_targetfiles_vintf to use the correct blkid binary."

This commit is contained in:
Baligh Uddin
2023-01-20 05:07:18 +00:00
committed by Gerrit Code Review

View File

@@ -237,7 +237,7 @@ def PrepareApexDirectory(inp):
if OPTIONS.search_path: if OPTIONS.search_path:
debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static') debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')
deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer') deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer')
blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid') blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid_static')
fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs') fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs')
if os.path.isfile(deapexer_path): if os.path.isfile(deapexer_path):
deapexer = deapexer_path deapexer = deapexer_path