Use hermetic timestamps in apkbuilder.py and refactor helper function

build/android/gyp/apkbuilder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2015 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.
 
 """Adds the code parts to a resource APK."""
 
 import argparse
 import itertools
@@ skipping 69 matching lines @@
 def _AddAssets(apk, paths, disable_compression=False):
   """Adds the given paths to the apk.
 
   Args:
     apk: ZipFile to write to.
     paths: List of paths (with optional :zipPath suffix) to add.
     disable_compression: Whether to disable compression.
   """
   # Group all uncompressed assets together in the hope that it will increase
   # locality of mmap'ed files.
-  for target_compress_type in (zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED):
+  for target_compress in (False, True):
     for path in paths:
       src_path, dest_path = _SplitAssetPath(path)
 
-      compress_type = zipfile.ZIP_DEFLATED
-      if disable_compression or (
-          os.path.splitext(src_path)[1] in _NO_COMPRESS_EXTENSIONS):
-        compress_type = zipfile.ZIP_STORED
-
-      if target_compress_type == compress_type:
+      compress = not disable_compression and (

[jbudorick, 2015/11/17 14:15:15]

nit: Can we flip this to enable_compression? I think it'd make this easier to
read than the double negative here.

[agrieve, 2015/11/18 20:36:34]

Normally agree, but in this case I think it's a bit more clear that the result
is to disable all compression, whereas when it's false (e.g. enable_compression)
- compression is still sometimes disabled based on file type.

+          os.path.splitext(src_path)[1] not in _NO_COMPRESS_EXTENSIONS)
+      if target_compress == compress:
         apk_path = 'assets/' + dest_path
         try:
           apk.getinfo(apk_path)
           # Should never happen since write_build_config.py handles merging.
           raise Exception('Multiple targets specified the asset path: %s' %
                           apk_path)
         except KeyError:
-          apk.write(src_path, apk_path, compress_type)
+          build_utils.AddToZipHermetic(apk, apk_path, src_path=src_path,
+                                       compress=compress)
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
 
   native_libs = []
   if options.native_libs_dir:
     native_libs = _ListSubPaths(options.native_libs_dir)
 
@@ skipping 15 matching lines @@
       shutil.copyfile(options.resource_apk, tmp_apk)
 
       # TODO(agrieve): It would be more efficient to combine this step
       # with finalize_apk(), which sometimes aligns and uncompresses the
       # native libraries.
       with zipfile.ZipFile(tmp_apk, 'a', zipfile.ZIP_DEFLATED) as apk:
         _AddAssets(apk, options.assets, disable_compression=False)
         _AddAssets(apk, options.uncompressed_assets, disable_compression=True)
         for path in native_libs:
           basename = os.path.basename(path)
-          apk.write(path, 'lib/%s/%s' % (options.android_abi, basename))
+          apk_path = 'lib/%s/%s' % (options.android_abi, basename)
+          build_utils.AddToZipHermetic(apk, apk_path, src_path=path)
         if options.create_placeholder_lib:
           # Make it non-empty so that its checksum is non-zero and is not
           # ignored by md5_check.
-          apk.writestr('lib/%s/libplaceholder.so' % options.android_abi, ':-)')
+          apk_path = 'lib/%s/libplaceholder.so' % options.android_abi
+          build_utils.AddToZipHermetic(apk, apk_path, data=':)')
         if options.dex_file:
-          apk.write(options.dex_file, 'classes.dex')
+          build_utils.AddToZipHermetic(apk, 'classes.dex',
+                                       src_path=options.dex_file)
 
       shutil.move(tmp_apk, options.output_apk)
     finally:
       if os.path.exists(tmp_apk):
         os.unlink(tmp_apk)
 
   build_utils.CallAndWriteDepfileIfStale(
       on_stale_md5,
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.output_apk])
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])