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

Commit 4b0224f6 authored by Baligh Uddin's avatar Baligh Uddin Committed by Automerger Merge Worker
Browse files

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

Merge "Switch check_targetfiles_vintf to use the correct blkid binary." am: 9f63b290 am: f5ef9905

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



Change-Id: Id294ba5dd01ae727d5ff158673baae6d1ed8b6d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20fd85c3 f5ef9905

tools/releasetools/check_target_files_vintf.py

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ def PrepareApexDirectory(inp): 
  if OPTIONS.search_path:

    debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')

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

    if os.path.isfile(deapexer_path):

      deapexer = deapexer_path