GN: Remove "outputs" parameter for java_cpp_enum()

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 206 matching lines @@
       CheckZipPath(name)
       if no_clobber:
         output_path = os.path.join(path, name)
         if os.path.exists(output_path):
           raise Exception(
               'Path already exists from zip: %s %s %s'
               % (zip_path, name, output_path))
       z.extract(name, path)
 
 
+def CreateHermeticZipInfo(zip_path):
+  """Creates a ZipInfo with a zero'ed out timestamp."""
+  CheckZipPath(zip_path)
+  zipinfo = zipfile.ZipInfo(filename=zip_path, date_time=HERMETIC_TIMESTAMP)
+  zipinfo.external_attr = HERMETIC_FILE_ATTR
+  return zipinfo
+
+
 def DoZip(inputs, output, base_dir=None):
   """Creates a zip file from a list of files.
 
   Args:
     inputs: A list of paths to zip, or a list of (zip_path, fs_path) tuples.
     output: Destination .zip file.
     base_dir: Prefix to strip from inputs.
   """
   input_tuples = []
   for tup in inputs:
     if isinstance(tup, basestring):
       tup = (os.path.relpath(tup, base_dir), tup)
     input_tuples.append(tup)
 
   # Sort by zip path to ensure stable zip ordering.
   input_tuples.sort(key=lambda tup: tup[0])
   with zipfile.ZipFile(output, 'w') as outfile:
     for zip_path, fs_path in input_tuples:
-      CheckZipPath(zip_path)
-      zipinfo = zipfile.ZipInfo(filename=zip_path, date_time=HERMETIC_TIMESTAMP)
-      zipinfo.external_attr = HERMETIC_FILE_ATTR
       with file(fs_path) as f:
         contents = f.read()
-      outfile.writestr(zipinfo, contents)
+      outfile.writestr(CreateHermeticZipInfo(zip_path), contents)
 
 
 def ZipDir(output, base_dir):
   """Creates a zip file from a directory."""
   inputs = []
   for root, _, files in os.walk(base_dir):
     for f in files:
       inputs.append(os.path.join(root, f))
   DoZip(inputs, output, base_dir)
 
 
 def MatchesGlob(path, filters):
   """Returns whether the given path matches any of the given glob patterns."""
   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():
+          # Ignore directories.
+          if name[-1] == '/':
+            continue
           dst_name = path_transform(name, in_file)
           already_added = dst_name in added_names
           if not already_added and not MatchesGlob(dst_name, exclude_patterns):
-            zipinfo = zipfile.ZipInfo(filename=dst_name,
-                                      date_time=HERMETIC_TIMESTAMP)
-            zipinfo.external_attr = HERMETIC_FILE_ATTR
-            out_zip.writestr(zipinfo, in_zip.read(name))
+            out_zip.writestr(CreateHermeticZipInfo(dst_name), in_zip.read(name))
             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)