Reland #2 of Fix monochrome not booting issue

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 167 matching lines @@
   FileGroup = collections.namedtuple('FileGroup',
                                      ['name', 'regex', 'extracted'])
 
   # File groups are checked in sequence, so more specific regexes should be
   # earlier in the list.
   YES = lambda _: True
   NO = lambda _: False
   FILE_GROUPS = (
       FileGroup('Native code', r'\.so$', lambda f: 'crazy' not in f),
       FileGroup('Java code', r'\.dex$', YES),
-      FileGroup('Native resources (no l10n)', r'\.pak$', NO),
+      FileGroup('Native resources (no l10n)',
+                r'^assets/.*(resources|percent)\.pak$', NO),
       # For locale paks, assume only english paks are extracted.
-      FileGroup('Native resources (l10n)', r'\.lpak$', lambda f: 'en_' in f),
-      FileGroup('ICU (i18n library) data', r'assets/icudtl\.dat$', NO),
-      FileGroup('V8 Snapshots', r'\.bin$', NO),
+      # Handles locale paks as bother resources or assets (.lpak or .pak).
+      FileGroup('Native resources (l10n)',
+                r'\.lpak$|^assets/.*(?!resources|percent)\.pak$',
+                lambda f: 'en_' in f or 'en-' in f),
+      FileGroup('ICU (i18n library) data', r'^assets/icudtl\.dat$', NO),
+      FileGroup('V8 Snapshots', r'^assets/.*\.bin$', NO),
       FileGroup('PNG drawables', r'\.png$', NO),
       FileGroup('Non-compiled Android resources', r'^res/', NO),
       FileGroup('Compiled Android resources', r'\.arsc$', NO),
       FileGroup('Package metadata', r'^(META-INF/|AndroidManifest\.xml$)', NO),
       FileGroup('Unknown files', r'.', NO),
       )
 
   apk = zipfile.ZipFile(apk_filename, 'r')
   try:
     apk_contents = apk.infolist()
@@ skipping 11 matching lines @@
     for group in FILE_GROUPS:
       if re.search(group.regex, member.filename):
         found_files[group].append(member)
         break
     else:
       raise KeyError('No group found for file "%s"' % member.filename)
 
   total_install_size = total_apk_size
 
   for group in FILE_GROUPS:
-    uncompressed_size = sum(member.file_size for member in found_files[group])
-    packed_size = sum(member.compress_size for member in found_files[group])
-    install_size = packed_size
-    install_bytes = sum(member.file_size for member in found_files[group]
-                        if group.extracted(member.filename))
-    install_size += install_bytes
-    total_install_size += install_bytes
+    uncompressed_size = 0
+    packed_size = 0
+    extracted_size = 0
+    for member in found_files[group]:
+      uncompressed_size += member.file_size
+      packed_size += member.compress_size
+      # Assume that if a file is not compressed, then it is not extracted.
+      is_compressed = member.compress_type != zipfile.ZIP_STORED
+      if is_compressed and group.extracted(member.filename):
+        extracted_size += member.file_size
+    install_size = packed_size + extracted_size
+    total_install_size += extracted_size
 
     ReportPerfResult(chartjson, apk_basename + '_Breakdown',
                      group.name + ' size', packed_size, 'bytes')
     ReportPerfResult(chartjson, apk_basename + '_InstallBreakdown',
                      group.name + ' size', install_size, 'bytes')
     ReportPerfResult(chartjson, apk_basename + '_Uncompressed',
                      group.name + ' size', uncompressed_size, 'bytes')
 
   transfer_size = _CalculateCompressedSize(apk_filename)
   ReportPerfResult(chartjson, apk_basename + '_InstallSize',
@@ skipping 259 matching lines @@
 
   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))