Merging 18 commit(s) from Chromium's toolchain-utils am: 0ae38c8498 am: 2a19d36a82 am: e617e3393dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-release

Change-Id: I3f25c7ee034b2e20e37ed941b8eae24eec7043eb

1 files changed, 44 insertions, 38 deletions

diff --git a/debug_info_test/check_icf.py b/debug_info_test/check_icf.py
index 4ac67dbd..a46968e7 100644
--- a/debug_info_test/check_icf.py
+++ b/debug_info_test/check_icf.py
@@ -1,47 +1,53 @@
+# -*- coding: utf-8 -*-
 # Copyright 2018 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+"""check whether chrome was built with identical code folding."""
+
+from __future__ import print_function
+
 import os
 import re
 import subprocess
 
+
 def check_identical_code_folding(dso_path):
-    """check whether chrome was built with identical code folding.
-
-    Args:
-        dso_path: path to the dso
-    Return:
-        False if the dso is chrome and it was not built with icf,
-        True otherwise.
-    """
-
-    if not dso_path.endswith('/chrome.debug'):
-        return True
-
-    # Run 'nm' on the chrome binary and read the output.
-    nm = subprocess.Popen(['nm', dso_path],
-                          stdout=subprocess.PIPE,
-                          stderr=open(os.devnull, 'w'))
-    nm_output, _ = nm.communicate()
-
-    # Search for addresses of text symbols.
-    text_addresses = re.findall('^[0-9a-f]+[ ]+[tT] ',
-                                nm_output,
-                                re.MULTILINE)
-
-    # Calculate number of text symbols in chrome binary.
-    num_text_addresses = len(text_addresses)
-
-    # Calculate number of unique text symbols in chrome binary.
-    num_unique_text_addresses = len(set(text_addresses))
-
-    # Check that the number of duplicate symbols is at least 10,000.
-    #   - https://crbug.com/813272#c18
-    if num_text_addresses-num_unique_text_addresses >= 10000:
-        return True
-
-    print('%s was not built with ICF' % dso_path)
-    print('    num_text_addresses = %d' % num_text_addresses)
-    print('    num_unique_text_addresses = %d' % num_unique_text_addresses)
-    return False
+  """check whether chrome was built with identical code folding.
+
+  Args:
+    dso_path: path to the dso.
+
+  Returns:
+    False if the dso is chrome and it was not built with icf,
+    True otherwise.
+  """
+
+  if not dso_path.endswith('/chrome.debug'):
+    return True
+
+  # Run 'nm' on the chrome binary and read the output.
+  nm = subprocess.Popen(['nm', dso_path],
+                        stdout=subprocess.PIPE,
+                        stderr=open(os.devnull, 'w'),
+                        encoding='utf-8')
+  nm_output, _ = nm.communicate()
+
+  # Search for addresses of text symbols.
+  text_addresses = re.findall('^[0-9a-f]+[ ]+[tT] ', nm_output, re.MULTILINE)
+
+  # Calculate number of text symbols in chrome binary.
+  num_text_addresses = len(text_addresses)
+
+  # Calculate number of unique text symbols in chrome binary.
+  num_unique_text_addresses = len(set(text_addresses))
+
+  # Check that the number of duplicate symbols is at least 10,000.
+  #   - https://crbug.com/813272#c18
+  if num_text_addresses - num_unique_text_addresses >= 10000:
+    return True
+
+  print('%s was not built with ICF' % dso_path)
+  print('    num_text_addresses = %d' % num_text_addresses)
+  print('    num_unique_text_addresses = %d' % num_unique_text_addresses)
+  return False