🎍 Add field counts to method_count.py

build/android/method_count.py

Index: build/android/method_count.py
diff --git a/build/android/method_count.py b/build/android/method_count.py
index 6569f0eeba50f2389dd6509ed874ebf7ddd68e17..ae3b4a2973b88d232adf94a45d202c907b7a7a02 100755
--- a/build/android/method_count.py
+++ b/build/android/method_count.py
@@ -4,6 +4,7 @@
 # found in the LICENSE file.
 
 import argparse
+import collections
 import os
 import re
 import shutil
@@ -19,34 +20,62 @@ sys.path.append(os.path.join(host_paths.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
                              'common'))
 import perf_tests_results_helper # pylint: disable=import-error
 
-
-_METHOD_IDS_SIZE_RE = re.compile(r'^method_ids_size +: +(\d+)$')
-
-def ExtractIfZip(dexfile, tmpdir):
-  if not os.path.splitext(dexfile)[1] in ('.zip', '.apk', '.jar'):
-    return [dexfile]
-
-  with zipfile.ZipFile(dexfile, 'r') as z:
-    dex_files = [n for n in z.namelist() if n.endswith('.dex')]
-    z.extractall(tmpdir, dex_files)
-
-  return [os.path.join(tmpdir, f) for f in dex_files]
-
-def SingleMethodCount(dexfile):
-  for line in dexdump.DexDump(dexfile, file_summary=True):
-    m = _METHOD_IDS_SIZE_RE.match(line)
+# Example dexdump output:
+# DEX file header:
+# magic               : 'dex\n035\0'
+# checksum            : b664fc68
+# signature           : ae73...87f1
+# file_size           : 4579656
+# header_size         : 112
+# link_size           : 0
+# link_off            : 0 (0x000000)
+# string_ids_size     : 46148
+# string_ids_off      : 112 (0x000070)
+# type_ids_size       : 5730
+# type_ids_off        : 184704 (0x02d180)
+# proto_ids_size       : 8289
+# proto_ids_off        : 207624 (0x032b08)
+# field_ids_size      : 17854
+# field_ids_off       : 307092 (0x04af94)
+# method_ids_size     : 33699
+# method_ids_off      : 449924 (0x06dd84)
+# class_defs_size     : 2616
+# class_defs_off      : 719516 (0x0afa9c)
+# data_size           : 3776428
+# data_off            : 803228 (0x0c419c)
+
+# For what these mean, refer to:
+# https://source.android.com/devices/tech/dalvik/dex-format.html
+
+
+def _ExtractSizesFromDexFile(dex_path):
+  counts = {}
+  for line in dexdump.DexDump(dex_path, file_summary=True):
+    if not line.strip():
+      return counts
+    m = re.match(r'([a-z_]+_size) *: (\d+)', line)
     if m:
-      return m.group(1)
-  raise Exception('"method_ids_size" not found in dex dump of %s' % dexfile)
+      counts[m.group(1)] = int(m.group(2))
+  raise Exception('Unexpected end of output.')
 
-def MethodCount(dexfile):
+
+def _ExtractSizesFromZip(path):
   tmpdir = tempfile.mkdtemp(suffix='_dex_extract')
-  multidex_file_list = ExtractIfZip(dexfile, tmpdir)
   try:
-    return sum(int(SingleMethodCount(d)) for d in multidex_file_list)
+    counts = collections.defaultdict(int)
+    with zipfile.ZipFile(path, 'r') as z:
+      for subpath in z.namelist():
+        if not subpath.endswith('.dex'):
+          continue
+        extracted_path = z.extract(subpath, tmpdir)
+        cur_counts = _ExtractSizesFromDexFile(extracted_path)
+        for k in cur_counts:
+          counts[k] += cur_counts[k]
+    return dict(counts)
   finally:
     shutil.rmtree(tmpdir)
 
+
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument(
@@ -69,9 +98,19 @@ def main():
           'Unable to determine apk name from %s, '
           'and --apk-name was not provided.' % args.dexfile)
 
-  method_count = MethodCount(args.dexfile)
-  perf_tests_results_helper.PrintPerfResult(
-      '%s_methods' % args.apk_name, 'total', [method_count], 'methods')
+  if os.path.splitext(args.dexfile)[1] in ('.zip', '.apk', '.jar'):
+    sizes = _ExtractSizesFromZip(args.dexfile)
+  else:
+    sizes = _ExtractSizesFromDexFile(args.dexfile)
+
+  def print_result(name, value_key):
+    perf_tests_results_helper.PrintPerfResult(
+        '%s_%s' % (args.apk_name, name), 'total', [sizes[value_key]], name)
+
+  print_result('classes', 'class_defs_size')
+  print_result('fields', 'field_ids_size')
+  print_result('methods', 'method_ids_size')
+  print_result('strings', 'string_ids_size')
   return 0
 
 if __name__ == '__main__':