Use hermetic timestamps in apkbuilder.py and refactor helper function

build/android/gyp/java_google_api_keys.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 # Generates a Java file with API keys.
 
 import argparse
 import os
 import string
 import sys
 import zipfile
 
+from util import build_utils
+
 sys.path.append(
     os.path.abspath(os.path.join(sys.path[0], '../../../google_apis')))
 import google_api_keys
 
 sys.path.append(os.path.abspath(os.path.join(
     os.path.dirname(__file__), os.pardir)))
 from pylib import constants
 
 
 PACKAGE = 'org.chromium.chrome'
 CLASSNAME = 'GoogleAPIKeys'
-HERMETIC_TIMESTAMP = (2001, 1, 1, 0, 0, 0)
-HERMETIC_FILE_ATTR = (0644 << 16L)
 
 
 def GetScriptName():
   return os.path.relpath(__file__, constants.DIR_SOURCE_ROOT)
 
 
 def GenerateOutput(constant_definitions):
   template = string.Template("""
 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ skipping 39 matching lines @@
   with open(output_path, 'w') as out_file:
     out_file.write(GenerateOutput(constant_definition))
 
 
 def _DoWriteJarOutput(output_path, constant_definition):
   folder = os.path.dirname(output_path)
   if folder and not os.path.exists(folder):
     os.makedirs(folder)
   with zipfile.ZipFile(output_path, 'w') as srcjar:
     path = '%s/%s' % (PACKAGE.replace('.', '/'), CLASSNAME + '.java')
-    zipinfo = zipfile.ZipInfo(filename=path,
-                              date_time=HERMETIC_TIMESTAMP)
-    zipinfo.external_attr = HERMETIC_FILE_ATTR
-    srcjar.writestr(zipinfo, GenerateOutput(constant_definition))
+    data = GenerateOutput(constant_definition)
+    build_utils.AddToZipHermetic(srcjar, path, data=data)
 
 
 def _DoMain(argv):
   parser = argparse.ArgumentParser()
   parser.add_argument("--out", help="Path for java output.")
   parser.add_argument("--srcjar", help="Path for srcjar output.")
   options = parser.parse_args(argv)
   if not options.out and not options.srcjar:
     parser.print_help()
     sys.exit(-1)
@@ skipping 21 matching lines @@
 
   if options.out:
     _DoWriteJavaOutput(options.out, values)
   if options.srcjar:
     _DoWriteJarOutput(options.srcjar, values)
 
 
 if __name__ == '__main__':
   _DoMain(sys.argv[1:])