Use hermetic timestamps in apkbuilder.py and refactor helper function

build/android/gyp/java_cpp_enum.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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 collections
 from datetime import date
 import re
 import optparse
@@ skipping 310 matching lines @@
 
   options, args = parser.parse_args(argv)
   if options.srcjar:
     if options.print_output_only:
       parser.error('--print_output_only does not work with --srcjar')
     if options.assert_files_list:
       parser.error('--assert_file does not work with --srcjar')
 
     with zipfile.ZipFile(options.srcjar, 'w', zipfile.ZIP_STORED) as srcjar:
       for output_path, data in DoGenerate(args):
-        srcjar.writestr(build_utils.CreateHermeticZipInfo(output_path), data)
+        build_utils.AddToZipHermetic(srcjar, output_path, data=data)
   else:
     # TODO(agrieve): Delete this non-srcjar branch once GYP is gone.
     if len(args) < 2:
       parser.error(
           'Need to specify output directory and at least one input file')
 
     output_dir = args[0]
     output_paths = []
     for output_path, data in DoGenerate(args[1:]):
       full_path = os.path.join(output_dir, output_path)
       output_paths.append(full_path)
       if not options.print_output_only:
         build_utils.MakeDirectory(os.path.dirname(full_path))
         with open(full_path, 'w') as out_file:
           out_file.write(data)
 
     if options.assert_files_list:
       AssertFilesList(output_paths, options.assert_files_list)
 
     if options.verbose:
       print 'Output paths:'
       print '\n'.join(output_paths)
 
     # Used by GYP.
     return ' '.join(output_paths)
 
 
 if __name__ == '__main__':
   DoMain(sys.argv[1:])