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

Commit b2be5798 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only add apex_info for compressed apexes" am: 472a860b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8f6a14269b7b6883d886dcf4aa5ce5f4665cfe3
parents 83643f01 472a860b

tools/releasetools/apex_utils.py

+10 −9
Original line number Diff line number Diff line
@@ -539,6 +539,15 @@ def GetApexInfoFromTargetFiles(input_file): 
  target_dir = os.path.join(tmp_dir, "SYSTEM/apex/")



  apex_infos = []



  debugfs_path = "debugfs"

  if OPTIONS.search_path:

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

  deapexer = 'deapexer'

  if OPTIONS.search_path:

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

    if os.path.isfile(deapexer_path):

      deapexer = deapexer_path

  for apex_filename in os.listdir(target_dir):

    apex_filepath = os.path.join(target_dir, apex_filename)

    if not os.path.isfile(apex_filepath) or \
@@ -551,14 +560,6 @@ def GetApexInfoFromTargetFiles(input_file): 
    apex_info.package_name = manifest.name

    apex_info.version = manifest.version

    # Check if the file is compressed or not

    debugfs_path = "debugfs"

    if OPTIONS.search_path:

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

    deapexer = 'deapexer'

    if OPTIONS.search_path:

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

      if os.path.isfile(deapexer_path):

        deapexer = deapexer_path

    apex_type = RunAndCheckOutput([

        deapexer, "--debugfs_path", debugfs_path,

        'info', '--print-type', apex_filepath]).rstrip()