Revert of 🚀 Add dex info and static initializers to 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.
 """
 
 import collections
 import json
 import logging
 import operator
 import optparse
 import os
 import re
 import struct
 import sys
 import tempfile
 import zipfile
 import zlib
 
 import devil_chromium
 from devil.utils import cmd_helper
-import method_count
 from pylib import constants
 from pylib.constants import host_paths
 
 _GRIT_PATH = os.path.join(host_paths.DIR_SOURCE_ROOT, 'tools', 'grit')
 
 # Prepend the grit module from the source tree so it takes precedence over other
 # grit versions that might present in the search path.
 with host_paths.SysPath(_GRIT_PATH, 1):
   from grit.format import data_pack # pylint: disable=import-error
 
 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
   import perf_tests_results_helper # pylint: disable=import-error
 
-
 # Python had a bug in zipinfo parsing that triggers on ChromeModern.apk
 # https://bugs.python.org/issue14315
 def _PatchedDecodeExtra(self):
   # Try to decode the extra field.
   extra = self.extra
   unpack = struct.unpack
   while len(extra) >= 4:
     tp, ln = unpack('<HH', extra[:4])
     if tp == 1:
       if ln >= 24:
@@ skipping 297 matching lines @@
         if m:
           i = int(m.group('id'))
           name = m.group('name')
           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
   return id_name_map
 
 
-def _PrintStaticInitializersCountFromApk(apk_filename, chartjson=None):
-  print 'Finding static initializers (can take a minute)'
-  with zipfile.ZipFile(apk_filename) as z:
-    infolist = z.infolist()
-  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:
-      unstripped_path = os.path.join(out_dir, 'lib.unstripped',
-                                     os.path.basename(zip_info.filename))
-      if os.path.exists(unstripped_path):
-        si_count += _PrintStaticInitializersCount(unstripped_path)
-      else:
-        raise Exception('Unstripped .so not found. Looked here: %s',
-                        unstripped_path)
-  ReportPerfResult(chartjson, 'StaticInitializersCount', 'count', si_count,
-                   'count')
-
-
-def _PrintStaticInitializersCount(so_with_symbols_path):
-  """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.
+def PrintStaticInitializersCount(so_with_symbols_path, chartjson=None):
+  """Emits the performance result for static initializers found in the provided
+     shared library. Additionally, files for which static initializers were
+     found are printed on the standard output.
 
      Args:
        so_with_symbols_path: Path to the unstripped libchrome.so file.
-
-     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.
   si_count = CountStaticInitializers(so_with_symbols_path)
   static_initializers = GetStaticInitializers(so_with_symbols_path)
-  static_initializers_count = len(static_initializers) - 1  # Minus summary.
-  if si_count != static_initializers_count:
+  if si_count != len(static_initializers):
     print ('There are %d files with static initializers, but '
            'dump-static-initializers found %d:' %
-           (si_count, static_initializers_count))
+           (si_count, len(static_initializers)))
   else:
-    print '%s - Found %d files with static initializers:' % (
-        os.path.basename(so_with_symbols_path), si_count)
+    print 'Found %d files with static initializers:' % si_count
   print '\n'.join(static_initializers)
 
-  return si_count
+  ReportPerfResult(chartjson, 'StaticInitializersCount', 'count',
+                   si_count, '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:
     byts /= 2**10.0
     return '%.2fk' % byts
   return str(byts)
 
 
 def _CalculateCompressedSize(file_path):
   CHUNK_SIZE = 256 * 1024
   compressor = zlib.compressobj()
   total_size = 0
   with open(file_path, 'rb') as f:
     for chunk in iter(lambda: f.read(CHUNK_SIZE), ''):
       total_size += len(compressor.compress(chunk))
   total_size += len(compressor.flush())
   return total_size
 
 
-def _PrintDexAnalysis(apk_filename, chartjson=None):
-  sizes = method_count.ExtractSizesFromZip(apk_filename)
-
-  graph_title = os.path.basename(apk_filename) + '_Dex'
-  dex_metrics = method_count.CONTRIBUTORS_TO_DEX_CACHE
-  for key, label in dex_metrics.iteritems():
-    ReportPerfResult(chartjson, graph_title, label, sizes[key], 'entries')
-
-  graph_title = '%sCache' % graph_title
-  ReportPerfResult(chartjson, graph_title, 'DexCache', sizes['dex_cache_size'],
-                   'bytes')
-
-
 def main(argv):
   usage = """Usage: %prog [options] file1 file2 ...
 
 Pass any number of files to graph their sizes. Any files with the extension
 '.apk' will be broken down into their components on a separate graph."""
   option_parser = optparse.OptionParser(usage=usage)
-  option_parser.add_option('--so-path',
-                           help='Obsolete. Pass .so as positional arg instead.')
+  option_parser.add_option('--so-path', help='Path to libchrome.so.')
   option_parser.add_option('--so-with-symbols-path',
-                           help='Mostly obsolete. Use .so within .apk instead.')
+                           help='Path to libchrome.so with symbols.')
   option_parser.add_option('--min-pak-resource-size', type='int',
                            default=20*1024,
                            help='Minimum byte size of displayed pak resources.')
   option_parser.add_option('--build_type', dest='build_type', default='Debug',
-                           help='Obsoleted by --chromium-output-directory.')
+                           help='Sets the build type, default is Debug.')
   option_parser.add_option('--chromium-output-directory',
                            help='Location of the build artifacts. '
                                 'Takes precidence over --build_type.')
   option_parser.add_option('--chartjson', action="store_true",
                            help='Sets output mode to chartjson.')
   option_parser.add_option('--output-dir', default='.',
                            help='Directory to save chartjson to.')
   option_parser.add_option('-d', '--device',
                            help='Dummy option for perf runner.')
   options, args = option_parser.parse_args(argv)
@@ skipping 10 matching lines @@
   # more.
   if options.so_path:
     files.append(options.so_path)
 
   if not files:
     option_parser.error('Must specify a file')
 
   devil_chromium.Initialize()
 
   if options.so_with_symbols_path:
-    si_count = _PrintStaticInitializersCount(options.so_with_symbols_path)
-    ReportPerfResult(chartjson, 'StaticInitializersCount', 'count', si_count,
-                     'count')
+    PrintStaticInitializersCount(
+        options.so_with_symbols_path, chartjson=chartjson)
 
   PrintResourceSizes(files, chartjson=chartjson)
 
   for f in files:
     if f.endswith('.apk'):
       PrintApkAnalysis(f, chartjson=chartjson)
       PrintPakAnalysis(f, options.min_pak_resource_size)
-      _PrintDexAnalysis(f, chartjson=chartjson)
-      if not options.so_with_symbols_path:
-        _PrintStaticInitializersCountFromApk(f, chartjson=chartjson)
 
   if chartjson:
     results_path = os.path.join(options.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(sys.argv))