Merge "Skip flattened apexes while check_target_files_vintf"

2022-10-17 06:09:15 +00:00
parent ddfc1ebf14 62283b9649
commit 09d7031f7d
1 changed files with 15 additions and 11 deletions
--- a/tools/releasetools/check_target_files_vintf.py
+++ b/tools/releasetools/check_target_files_vintf.py
@@ -241,6 +241,10 @@ def PrepareApexDirectory(inp):
    for f in os.listdir(path):
      logger.info('  adding APEX %s', os.path.basename(f))
      apex = os.path.join(path, f)
+      if os.path.isdir(apex):
+        # TODO(b/242314000) Handle "flattened" apex
+        pass
+      else:
        cmd = [deapexer,
               '--debugfs_path', debugfs_path,
               'info',