StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I655deb975bed07917009091fa073ff9090f9ce5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Baligh Uddin
2023-01-20 05:32:57 +00:00
committed by Automerger Merge Worker
parent bd2e23ee99 9f63b29083
commit f5ef99054d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/check_target_files_vintf.py
View File

@@ -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