Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeb92a13 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Remove APEX from merged target-files package" into main am: 2ee7f71e 

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



Change-Id: Id16909d68f2ca01cbd0093fbbdc438bcf38f605d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af7c3ce4 2ee7f71e

tools/releasetools/check_target_files_vintf.py

+2 −2
Original line number Diff line number Diff line
@@ -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')