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

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

Merge "Skip flattened apexes while check_target_files_vintf" am: 09d7031f 

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



Change-Id: I38d8b919aa9855dd0904a10b363b696331ac7b84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91091a7d 09d7031f

tools/releasetools/check_target_files_vintf.py

+16 −12
Original line number Original line Diff line number Diff line
@@ -241,6 +241,10 @@ def PrepareApexDirectory(inp): 
    for f in os.listdir(path):

    for f in os.listdir(path):

      logger.info('  adding APEX %s', os.path.basename(f))

      logger.info('  adding APEX %s', os.path.basename(f))

      apex = os.path.join(path, f)

      apex = os.path.join(path, f)

      if os.path.isdir(apex):

        # TODO(b/242314000) Handle "flattened" apex

        pass

      else:

        cmd = [deapexer,

        cmd = [deapexer,

               '--debugfs_path', debugfs_path,

               '--debugfs_path', debugfs_path,

               'info',

               'info',