tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Skip flattened apexes while check_target_files_vintf

Browse source 
Flattened apexes should be handled differently. For now just skip
flattened apexes to fix the build breakage.

Bug: 253669548
Bug: 253700117
Bug: 239055765
Test: m otapackage for targets with "flattened apexes"
Change-Id: I102a961fc1365f42881ca9ee6546e71246792d2a
This commit is contained in:
Jooyung Han 2022-10-17 10:24:09 +09:00
parent ddfc1ebf14
commit 62283b9649
1 changed files with 15 additions and 11 deletions
Show stats 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)