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

Merge "Update deapexer extract call with more input" am: 1c1a075006 am: 9d483f08df am: d82bfb301f

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

Change-Id: Icb90eda53afe01e577f6f94c77bcfe9cd79d2106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Shen
2022-11-04 01:44:00 +00:00
committed by Automerger Merge Worker
parent 13cde21b45 d82bfb301f
commit 0f384e94b7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/check_target_files_vintf.py
View File

@@ -229,11 +229,15 @@ def PrepareApexDirectory(inp):
apex-info-list.xml file
"""
debugfs_path = 'debugfs'
deapexer = 'deapexer'
debugfs_path = 'debugfs'
blkid_path = 'blkid'
fsckerofs_path = 'fsck.erofs'
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')
fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs')
if os.path.isfile(deapexer_path):
deapexer = deapexer_path
@@ -257,6 +261,8 @@ def PrepareApexDirectory(inp):
cmd = [deapexer,
'--debugfs_path', debugfs_path,
'--fsckerofs_path', fsckerofs_path,
'--blkid_path', blkid_path,
'extract',
apex,
os.path.join(outp, info['name'])]