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" am: 09d7031f7d

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

Change-Id: I38d8b919aa9855dd0904a10b363b696331ac7b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-17 06:46:40 +00:00
committed by Automerger Merge Worker
parent 91091a7d94 09d7031f7d
commit fa9ec4cd2d
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):
logger.info(' adding APEX %s', os.path.basename(f))
apex = os.path.join(path, f)
cmd = [deapexer,
'--debugfs_path', debugfs_path,
'info',
apex]
info = json.loads(common.RunAndCheckOutput(cmd))
if os.path.isdir(apex):
# TODO(b/242314000) Handle "flattened" apex
pass
else:
cmd = [deapexer,
'--debugfs_path', debugfs_path,
'info',
apex]
info = json.loads(common.RunAndCheckOutput(cmd))
cmd = [deapexer,
'--debugfs_path', debugfs_path,
'extract',
apex,
os.path.join(outp, info['name'])]
common.RunAndCheckOutput(cmd)
cmd = [deapexer,
'--debugfs_path', debugfs_path,
'extract',
apex,
os.path.join(outp, info['name'])]
common.RunAndCheckOutput(cmd)
root_dir_name = 'APEX'
root_dir = os.path.join(inp, root_dir_name)