Make mojom.srcjar files produce hermetic zip files.

mojo/public/tools/bindings/generators/mojom_java_generator.py

 # 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.
 
 """Generates java source files from a mojom.Module."""
 
 import argparse
 import ast
 import contextlib
 import os
 import re
 import shutil
+import sys
 import tempfile
-import zipfile
 
 from jinja2 import contextfilter
 
 import mojom.fileutil as fileutil
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 from mojom.generate.template_expander import UseJinja
 
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir,
+                             os.pardir, os.pardir, os.pardir, os.pardir,
+                             'build', 'android', 'gyp'))
+from util import build_utils
+
 
 GENERATOR_PREFIX = 'java'
 
 _spec_to_java_type = {
   mojom.BOOL.spec: 'boolean',
   mojom.DCPIPE.spec: 'org.chromium.mojo.system.DataPipe.ConsumerHandle',
   mojom.DOUBLE.spec: 'double',
   mojom.DPPIPE.spec: 'org.chromium.mojo.system.DataPipe.ProducerHandle',
   mojom.FLOAT.spec: 'float',
   mojom.HANDLE.spec: 'org.chromium.mojo.system.UntypedHandle',
@@ skipping 357 matching lines @@
   return False
 
 @contextlib.contextmanager
 def TempDir():
   dirname = tempfile.mkdtemp()
   try:
     yield dirname
   finally:
     shutil.rmtree(dirname)
 
-def ZipContentInto(root, zip_filename):
-  with zipfile.ZipFile(zip_filename, 'w') as zip_file:
-    for dirname, _, files in os.walk(root):
-      for filename in files:
-        path = os.path.join(dirname, filename)
-        path_in_archive = os.path.relpath(path, root)
-        zip_file.write(path, path_in_archive)
-
 class Generator(generator.Generator):
 
   java_filters = {
     'array_expected_length': GetArrayExpectedLength,
     'array': GetArrayKind,
     'constant_value': ConstantValue,
     'decode_method': DecodeMethod,
     'default_value': DefaultValue,
     'encode_method': EncodeMethod,
     'expression_to_text': ExpressionToText,
@@ skipping 108 matching lines @@
     args = parser.parse_args(unparsed_args)
     package_path = GetPackage(self.module).replace('.', '/')
 
     # Generate the java files in a temporary directory and place a single
     # srcjar in the output directory.
     basename = self.MatchMojomFilePath("%s.srcjar" % self.module.name)
     zip_filename = os.path.join(self.output_dir, basename)
     with TempDir() as temp_java_root:
       self.output_dir = os.path.join(temp_java_root, package_path)
       self.DoGenerateFiles();
-      ZipContentInto(temp_java_root, zip_filename)
+      build_utils.ZipDir(zip_filename, temp_java_root)
 
     if args.java_output_directory:
       # If requested, generate the java files directly into indicated directory.
       self.output_dir = os.path.join(args.java_output_directory, package_path)
       self.DoGenerateFiles();
 
   def GetJinjaParameters(self):
     return {
       'lstrip_blocks': True,
       'trim_blocks': True,
     }
 
   def GetGlobals(self):
     return {
       'namespace': self.module.namespace,
       'module': self.module,
     }