[mojo] Get rid of extraneous python scripts

This change removes the //mojo copy of zip.py
and updates mojom.gni to use the one from //build/android

Bug: 582594
Change-Id: I8e739c112696c47ce3afb68baf61b139359c5e98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2119636
Commit-Queue: Emily Andrews <emiled@microsoft.com>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753492}

mojo/public/tools/bindings/mojom.gni

@@ -1465,7 +1465,7 @@ template("mojom") {
 
       java_srcjar_target_name = target_name + "_java_sources"
       action(java_srcjar_target_name) {
-        script = "//mojo/public/tools/gn/zip.py"
+        script = "//build/android/gyp/zip.py"
         inputs = []
         if (output_file_base_paths != []) {
           foreach(base_path, output_file_base_paths) {
@@ -1477,7 +1477,7 @@ template("mojom") {
         rebase_inputs = rebase_path(inputs, root_build_dir)
         rebase_output = rebase_path(output, root_build_dir)
         args = [
-          "--zip-inputs=$rebase_inputs",
+          "--input-zips=$rebase_inputs",
           "--output=$rebase_output",
         ]
         deps = []

mojo/public/tools/gn/zip.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.
-
-# TODO(brettw) bug 582594: merge this with build/android/gn/zip.py and update
-# callers to use the existing template rather than invoking this directly.
-
-"""Archives a set of files.
-"""
-
-import optparse
-import os
-import sys
-import zipfile
-
-sys.path.append(os.path.join(os.path.dirname(__file__),
-                             os.pardir, os.pardir, os.pardir, os.pardir,
-                             "build"))
-import gn_helpers
-
-sys.path.append(os.path.join(os.path.dirname(__file__),
-                             os.pardir, os.pardir, os.pardir, os.pardir,
-                             'build', 'android', 'gyp'))
-from util import build_utils
-
-
-def DoZip(inputs, link_inputs, zip_inputs, output, base_dir):
-  files = []
-  with zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED) as outfile:
-    for f in inputs:
-      file_name = os.path.relpath(f, base_dir)
-      files.append(file_name)
-      build_utils.AddToZipHermetic(outfile, file_name, f)
-    for f in link_inputs:
-      realf = os.path.realpath(f)  # Resolve symlinks.
-      file_name = os.path.relpath(realf, base_dir)
-      files.append(file_name)
-      build_utils.AddToZipHermetic(outfile, file_name, realf)
-    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)
-            build_utils.AddToZipHermetic(outfile, f, data=zf.read(f))
-
-
-def main():
-  parser = optparse.OptionParser()
-
-  parser.add_option('--inputs',
-      help='GN format list of files to archive.')
-  parser.add_option('--link-inputs',
-      help='GN-format list of files to archive. Symbolic links are resolved.')
-  parser.add_option('--zip-inputs',
-      help='GN-format 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 '
-                    'relative to this directory', default='.')
-
-  options, _ = parser.parse_args()
-
-  inputs = []
-  if (options.inputs):
-    parser = gn_helpers.GNValueParser(options.inputs)
-    inputs = parser.ParseList()
-
-  link_inputs = []
-  if options.link_inputs:
-    parser = gn_helpers.GNValueParser(options.link_inputs)
-    link_inputs = parser.ParseList()
-
-  zip_inputs = []
-  if options.zip_inputs:
-    parser = gn_helpers.GNValueParser(options.zip_inputs)
-    zip_inputs = parser.ParseList()
-
-  output = options.output
-  base_dir = options.base_dir
-
-  DoZip(inputs, link_inputs, zip_inputs, output, base_dir)
-
-if __name__ == '__main__':
-  sys.exit(main())