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

Commit 44b714b7 authored by Dennis Shen's avatar Dennis Shen
Browse files

Update deapexer extract call with more input 

BUG: b/255963179, b/240288941
Change-Id: Id7f5eb20e4c6f3c3e793860389f4be48f4f3938f
parent 4b9babc1

tools/releasetools/check_target_files_vintf.py

+7 −1
Original line number Diff line number Diff line
@@ -229,11 +229,15 @@ def PrepareApexDirectory(inp): 
    apex-info-list.xml file

  """



  debugfs_path = 'debugfs'

  deapexer = 'deapexer'

  debugfs_path = 'debugfs'

  blkid_path = 'blkid'

  fsckerofs_path = 'fsck.erofs'

  if OPTIONS.search_path:

    debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')

    deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer')

    blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid')

    fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs')

    if os.path.isfile(deapexer_path):

      deapexer = deapexer_path
@@ -257,6 +261,8 @@ def PrepareApexDirectory(inp): 


        cmd = [deapexer,

               '--debugfs_path', debugfs_path,

               '--fsckerofs_path', fsckerofs_path,

               '--blkid_path', blkid_path,

               'extract',

               apex,

               os.path.join(outp, info['name'])]