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

Merge "Skip flattened apexes while check_target_files_vintf"

Browse Source
This commit is contained in:
Treehugger Robot
2022-10-17 06:09:15 +00:00
committed by Gerrit Code Review
parent ddfc1ebf14 62283b9649
commit 09d7031f7d
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/releasetools/check_target_files_vintf.py
View File

@@ -241,18 +241,22 @@ def PrepareApexDirectory(inp):
for f in os.listdir(path): for f in os.listdir(path):
logger.info(' adding APEX %s', os.path.basename(f)) logger.info(' adding APEX %s', os.path.basename(f))
apex = os.path.join(path, f) apex = os.path.join(path, f)
cmd = [deapexer, if os.path.isdir(apex):
'--debugfs_path', debugfs_path, # TODO(b/242314000) Handle "flattened" apex
'info', pass
apex] else:
info = json.loads(common.RunAndCheckOutput(cmd)) cmd = [deapexer,
'--debugfs_path', debugfs_path,
'info',
apex]
info = json.loads(common.RunAndCheckOutput(cmd))
cmd = [deapexer, cmd = [deapexer,
'--debugfs_path', debugfs_path, '--debugfs_path', debugfs_path,
'extract', 'extract',
apex, apex,
os.path.join(outp, info['name'])] os.path.join(outp, info['name'])]
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd)
root_dir_name = 'APEX' root_dir_name = 'APEX'
root_dir = os.path.join(inp, root_dir_name) root_dir = os.path.join(inp, root_dir_name)