Content handler for python.

mojo/public/tools/gn/zip.py

Index: mojo/public/tools/gn/zip.py
diff --git a/build/android/gn/zip.py b/mojo/public/tools/gn/zip.py
similarity index 58%
copy from build/android/gn/zip.py
copy to mojo/public/tools/gn/zip.py
index 5050ea07107d0afdcdfd273728447a614b4b5603..c703144b21c152ae34c8a88f8aa7ffa9e3ac8c4b 100755
--- a/build/android/gn/zip.py
+++ b/mojo/public/tools/gn/zip.py
@@ -13,19 +13,27 @@ import os
 import sys
 import zipfile
 
-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'gyp'))
-from util import build_utils
-
-def DoZip(inputs, output, base_dir):
+def DoZip(inputs, zip_inputs, output, base_dir):
+  files = []
   with zipfile.ZipFile(output, 'w') as outfile:
     for f in inputs:
-      outfile.write(f, os.path.relpath(f, base_dir))
+      file_name = os.path.relpath(f, base_dir)
+      files.append(file_name)
+      outfile.write(f, file_name)
+    for zf_name in zip_inputs:
+      with zipfile.ZipFile(zf_name, 'r') as zf:
+        for f in zf.namelist():
+          if f not in files:
+            files.append(f)
+            with zf.open(f) as zff:
+              outfile.writestr(f, zff.read())
+
 
 def main():
   parser = optparse.OptionParser()
-  build_utils.AddDepfileOption(parser)
 
   parser.add_option('--inputs', help='List of files to archive.')
+  parser.add_option('--zip-inputs', help='List of zip files to re-archive.')
   parser.add_option('--output', help='Path to output archive.')
   parser.add_option('--base-dir',
                     help='If provided, the paths in the archive will be '
@@ -34,16 +42,13 @@ def main():
   options, _ = parser.parse_args()
 
   inputs = ast.literal_eval(options.inputs)
+  zip_inputs = []
+  if options.zip_inputs:
+    zip_inputs = ast.literal_eval(options.zip_inputs)
   output = options.output
   base_dir = options.base_dir
 
-  DoZip(inputs, output, base_dir)
-
-  if options.depfile:
-    build_utils.WriteDepfile(
-        options.depfile,
-        build_utils.GetPythonDependencies())
-
+  DoZip(inputs, zip_inputs, output, base_dir)
 
 if __name__ == '__main__':
   sys.exit(main())