Android: update static initializer checks in resource_sizes.py.

build/android/resource_sizes.py

Index: build/android/resource_sizes.py
diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py
index 77000b9ded635f4d25125bd85079ebd0c9abe028..4ef47f30bce30fcf46088b5f161830056422c493 100755
--- a/build/android/resource_sizes.py
+++ b/build/android/resource_sizes.py
@@ -160,7 +160,7 @@ def _CreateSectionNameSizeMap(so_path, tools_prefix):
 
 def _ParseLibBuildId(so_path, tools_prefix):
   """Returns the Build ID of the given native library."""
-  stdout = _RunReadelf(so_path, ['n'], tools_prefix)
+  stdout = _RunReadelf(so_path, ['-n'], tools_prefix)
   match = re.search(r'Build ID: (\w+)', stdout)
   return match.group(1) if match else None
 
@@ -594,22 +594,22 @@ def _AnnotatePakResources():
 
 def _PrintStaticInitializersCountFromApk(apk_filename, tools_prefix,
                                          chartjson=None):
-  print 'Finding static initializers (can take a minute)'
   with zipfile.ZipFile(apk_filename) as z:
-    infolist = z.infolist()
+    so_files = [f for f in z.infolist()
+                if f.filename.endswith('.so') and f.file_size > 0]
+  has_64 = any('64' in f.filename for f in so_files)

[agrieve, 2017/04/07 19:46:40]

would be good to add in some comments saying why we check only one architecture.

+  files_to_check = [f for f in so_files if not has_64 or '64' in f.filename]
   out_dir = constants.GetOutDirectory()
   si_count = 0
-  for zip_info in infolist:
-    # Check file size to account for placeholder libraries.
-    if zip_info.filename.endswith('.so') and zip_info.file_size > 0:
-      lib_name = os.path.basename(zip_info.filename).replace('crazy.', '')
-      unstripped_path = os.path.join(out_dir, 'lib.unstripped', lib_name)
-      if os.path.exists(unstripped_path):
-        si_count += _PrintStaticInitializersCount(
-            apk_filename, zip_info.filename, unstripped_path, tools_prefix)
-      else:
-        raise Exception('Unstripped .so not found. Looked here: %s',
-                        unstripped_path)
+  for so_info in files_to_check:
+    lib_name = os.path.basename(so_info.filename).replace('crazy.', '')
+    unstripped_path = os.path.join(out_dir, 'lib.unstripped', lib_name)
+    if os.path.exists(unstripped_path):
+      si_count += _PrintStaticInitializersCount(
+          apk_filename, so_info.filename, unstripped_path, tools_prefix)
+    else:
+      raise Exception('Unstripped .so not found. Looked here: %s',
+                      unstripped_path)
   ReportPerfResult(chartjson, 'StaticInitializersCount', 'count', si_count,
                    'count')
 
@@ -628,21 +628,15 @@ def _PrintStaticInitializersCount(apk_path, apk_so_name, so_with_symbols_path,
      Returns:
        The number of static initializers found.
   """
-  # GetStaticInitializers uses get-static-initializers.py to get a list of all
-  # static initializers. This does not work on all archs (particularly arm).
-  # TODO(rnephew): Get rid of warning when crbug.com/585588 is fixed.
+  # This mostly copies infra/scripts/legacy/scripts/slave/chromium/sizes.py.
+  print 'Finding static initializers in %s (can take a minute)' % apk_so_name
   with Unzip(apk_path, filename=apk_so_name) as unzipped_so:
     _VerifyLibBuildIdsMatch(tools_prefix, unzipped_so, so_with_symbols_path)
     readelf_si_count = CountStaticInitializers(unzipped_so, tools_prefix)
-  sis, dump_si_count = GetStaticInitializers(
-      so_with_symbols_path, tools_prefix)
-  if readelf_si_count != dump_si_count:
-    print ('There are %d files with static initializers, but '
-           'dump-static-initializers found %d: files' %
-           (readelf_si_count, dump_si_count))
-  else:
-    print '%s - Found %d files with static initializers:' % (
-        os.path.basename(so_with_symbols_path), dump_si_count)
+  sis, dump_si_count = GetStaticInitializers(so_with_symbols_path, tools_prefix)
+  print ('Found %s files with static initializers using readelf\n'
+         'Found %s files with static initializers using '
+         'dump-static-initializers') % (readelf_si_count, dump_si_count)
   print '\n'.join(sis)
 
   return readelf_si_count