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

Merge "Remove APEX from merged target-files package" into main am: 2ee7f71e62 am: eeb92a131f am: 34addf571d

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

Change-Id: Icd540eab54a7add2b34da08197252b4cd3901818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2023-11-29 04:09:34 +00:00
committed by Automerger Merge Worker
parent 16869c1f06 34addf571d
commit d1d65ec245
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/check_target_files_vintf.py
View File

@@ -218,12 +218,12 @@ def PrepareApexDirectory(inp, dirmap):
2. invoke apexd_host with vendor APEXes.
"""
apex_dir = os.path.join(inp, 'APEX')
apex_dir = common.MakeTempDir('APEX')
# checkvintf needs /apex dirmap
dirmap['/apex'] = apex_dir
# Always create /apex directory for dirmap
os.makedirs(apex_dir)
os.makedirs(apex_dir, exist_ok=True)
# Invoke apexd_host to activate vendor APEXes for checkvintf
apex_host = os.path.join(OPTIONS.search_path, 'bin', 'apexd_host')