checkvintf with all apexes

Previously, checkvintf read only vendor apexes. Now, we support vintf
from other apexes.

Bug: 327365139
Test: m check-vintf-all
Change-Id: I46dc04ccdbe7d3f035ea9f63b1e45358ab31021b
This commit is contained in:
Jooyung Han
2024-03-07 17:32:09 +09:00
parent 85acebd157
commit 9738259f3e
2 changed files with 22 additions and 12 deletions

View File

@@ -215,7 +215,7 @@ def PrepareApexDirectory(inp, dirmap):
This simulates how apexd activates APEXes.
1. create {inp}/APEX which is treated as a "/apex" on device.
2. invoke apexd_host with vendor APEXes.
2. invoke apexd_host with APEXes.
"""
apex_dir = common.MakeTempDir('APEX')
@@ -225,12 +225,13 @@ def PrepareApexDirectory(inp, dirmap):
# Always create /apex directory for dirmap
os.makedirs(apex_dir, exist_ok=True)
# Invoke apexd_host to activate vendor APEXes for checkvintf
# Invoke apexd_host to activate APEXes for checkvintf
apex_host = os.path.join(OPTIONS.search_path, 'bin', 'apexd_host')
cmd = [apex_host, '--tool_path', OPTIONS.search_path]
cmd += ['--apex_path', dirmap['/apex']]
if '/vendor' in dirmap:
cmd += ['--vendor_path', dirmap['/vendor']]
for p in ['system', 'system_ext', 'product', 'vendor']:
if '/' + p in dirmap:
cmd += ['--' + p + '_path', dirmap['/' + p]]
common.RunAndCheckOutput(cmd)