Upgrade toolchain-utils to 2c474af4f370b143032144aff1ff1985f789e20f am: 8b320f7173 am: d444309511 am: 584b8e46d1android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release

Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/2292563

Change-Id: Ida212764c332af8ba8ab8aaa62a7d2a007e3314e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 45 insertions, 42 deletions

diff --git a/debug_info_test/debug_info_test.py b/debug_info_test/debug_info_test.py
index ae7e9f48..c324bf4c 100755
--- a/debug_info_test/debug_info_test.py
+++ b/debug_info_test/debug_info_test.py
@@ -1,67 +1,70 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Test for debug info."""
 
-from __future__ import print_function
 
 import os
 import subprocess
 import sys
 
-import check_icf
 import check_cus
 import check_exist
+import check_icf
+
 
 elf_checks = [
-    check_exist.check_exist_all, check_cus.check_compile_units,
-    check_icf.check_identical_code_folding
+    check_exist.check_exist_all,
+    check_cus.check_compile_units,
+    check_icf.check_identical_code_folding,
 ]
 
 
 def scanelf(root):
-  """Find ELFs in root.
+    """Find ELFs in root.
 
-  Args:
-    root: root dir to start with the search.
+    Args:
+      root: root dir to start with the search.
 
-  Returns:
-    Filenames of ELFs in root.
-  """
-  p = subprocess.Popen(['scanelf', '-y', '-B', '-F', '%F', '-R', root],
-                       stdout=subprocess.PIPE,
-                       encoding='utf-8')
-  return [l.strip() for l in p.stdout]
+    Returns:
+      Filenames of ELFs in root.
+    """
+    p = subprocess.Popen(
+        ["scanelf", "-y", "-B", "-F", "%F", "-R", root],
+        stdout=subprocess.PIPE,
+        encoding="utf-8",
+    )
+    return [l.strip() for l in p.stdout]
 
 
 def Main(argv):
-  if len(argv) < 2:
-    print('usage: %s [file|dir]')
-    return 1
-
-  files = []
-  cand = argv[1]
-  if os.path.isfile(cand):
-    files = [cand]
-  elif os.path.isdir(cand):
-    files = scanelf(cand)
-  else:
-    print('usage: %s [file|dir]')
-    return 1
-
-  failed = False
-  for f in files:
-    for c in elf_checks:
-      if not c(f):
-        failed = True
-
-  if failed:
-    return 1
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(Main(sys.argv))
+    if len(argv) < 2:
+        print("usage: %s [file|dir]")
+        return 1
+
+    files = []
+    cand = argv[1]
+    if os.path.isfile(cand):
+        files = [cand]
+    elif os.path.isdir(cand):
+        files = scanelf(cand)
+    else:
+        print("usage: %s [file|dir]")
+        return 1
+
+    failed = False
+    for f in files:
+        for c in elf_checks:
+            if not c(f):
+                failed = True
+
+    if failed:
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(Main(sys.argv))