Android: update static initializer checks in resource_sizes.py.

build/android/resource_sizes.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Prints the size of each given file and optionally computes the size of
    libchrome.so without the dependencies added for building with android NDK.
    Also breaks down the contents of the APK to determine the installed size
    and assign size contributions to different classes of file.
 """
@@ skipping 142 matching lines @@
   # Matches  [ 2] .hash HASH 00000000006681f0 0001f0 003154 04   A  3   0  8
   for match in re.finditer(r'\[[\s\d]+\] (\..*)$', stdout, re.MULTILINE):
     items = match.group(1).split()
     section_sizes[items[0]] = int(items[4], 16)
 
   return section_sizes
 
 
 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
 
 
 def CountStaticInitializers(so_path, tools_prefix):
   # Static initializers expected in official builds. Note that this list is
   # built using 'nm' on libchrome.so which results from a GCC official build
   # (i.e. Clang is not supported currently).
   def get_elf_section_size(readelf_stdout, section_name):
     # Matches: .ctors PROGBITS 000000000516add0 5169dd0 000010 00 WA 0 0 8
@@ skipping 413 matching lines @@
           if i in id_name_map and name != id_name_map[i]:
             print 'WARNING: Resource ID conflict %s (%s vs %s)' % (
                 i, id_name_map[i], name)
           id_name_map[i] = name
           id_header_map[i] = os.path.relpath(header, out_dir)
   return id_name_map, id_header_map
 
 
 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]
+  # Skip checking static initializers for 32 bit .so files when 64 bit .so files
+  # are present since the 32 bit versions will be checked by bots that only
+  # build the 32 bit version. This avoids the complexity of finding 32 bit .so
+  # files in the output directory in 64 bit builds.
+  has_64 = any('64' in f.filename for f in so_files)
+  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')
 
 
 def _PrintStaticInitializersCount(apk_path, apk_so_name, so_with_symbols_path,
                                   tools_prefix):
   """Counts the number of static initializers in the given shared library.
      Additionally, files for which static initializers were found are printed
      on the standard output.
 
      Args:
       apk_path: Path to the apk.
       apk_so_name: Name of the so.
       so_with_symbols_path: Path to the unstripped libchrome.so file.
       tools_prefix: Prefix for arch-specific version of binary utility tools.
      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
 
 def _FormatBytes(byts):
   """Pretty-print a number of bytes."""
   if byts > 2**20.0:
     byts /= 2**20.0
     return '%.2fm' % byts
   if byts > 2**10.0:
@@ skipping 126 matching lines @@
           args.apk, tools_prefix, chartjson=chartjson)
   if chartjson:
     results_path = os.path.join(args.output_dir, 'results-chart.json')
     logging.critical('Dumping json to %s', results_path)
     with open(results_path, 'w') as json_file:
       json.dump(chartjson, json_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())