Create dist jars only for instrumentation apks; use ijars for them

build/android/gyp/util/build_utils.py

 # Copyright 2013 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.
 
 import ast
 import contextlib
 import fnmatch
 import json
 import os
 import pipes
@@ skipping 308 matching lines @@
   return filters and any(fnmatch.fnmatch(path, f) for f in filters)
 
 
 def MergeZips(output, inputs, exclude_patterns=None, path_transform=None):
   path_transform = path_transform or (lambda p, z: p)
   added_names = set()
 
   with zipfile.ZipFile(output, 'w') as out_zip:
     for in_file in inputs:
       with zipfile.ZipFile(in_file, 'r') as in_zip:
-        for name in in_zip.namelist():
+        in_zip._expected_crc = None
+        for info in in_zip.infolist():
           # Ignore directories.
-          if name[-1] == '/':
+          if info.filename[-1] == '/':
             continue
-          dst_name = path_transform(name, in_file)
+          # Don't validate CRCs. ijar sets them all to 0.
+          if hasattr(info, 'CRC'):

[jbudorick, 2016/02/08 16:24:12]

do we only call this function for ijars...?

[agrieve, 2016/02/08 16:42:01]

It's only needed for ijars, but I don't think verifying CRCs of zip entries is
useful for us anyways.

[jbudorick, 2016/02/08 16:59:10]

sgtm

+            del info.CRC
+          dst_name = path_transform(info.filename, in_file)
           already_added = dst_name in added_names
           if not already_added and not MatchesGlob(dst_name, exclude_patterns):
-            AddToZipHermetic(out_zip, dst_name, data=in_zip.read(name))
+            AddToZipHermetic(out_zip, dst_name, data=in_zip.read(info))
             added_names.add(dst_name)
 
 
 def PrintWarning(message):
   print 'WARNING: ' + message
 
 
 def PrintBigWarning(message):
   print '*****     ' * 8
   PrintWarning(message)
@@ skipping 154 matching lines @@
 
   md5_check.CallAndRecordIfStale(
       on_stale_md5,
       record_path=record_path,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
       force=force,
       pass_changes=True)