Remove the mojom-sources flag from dart_pkg.py

BUG=
R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/1824253002 .

mojo/public/dart/rules.gni

diff --git a/mojo/public/dart/rules.gni b/mojo/public/dart/rules.gni
index 0d80351..dfaa947 100644
--- a/mojo/public/dart/rules.gni
+++ b/mojo/public/dart/rules.gni
@@ -172,20 +172,6 @@
       datadeps += invoker.datadeps
     }
 
-    list_mojoms_script =
-        rebase_path("mojo/public/tools/dart_list_mojoms.py", ".", mojo_sdk_root)
-    mojom_sources = []
-    foreach(d, deps) {
-      root_prefix = rebase_path(".", "", mojo_sdk_root)
-      source_directory = rebase_path(get_label_info(d, "dir"))
-      mojom_sources += exec_script(list_mojoms_script,
-                                   [
-                                     source_directory,
-                                     root_prefix,
-                                   ],
-                                   "list lines")
-    }
-
     sdk_ext_directory = []
     if (defined(invoker.sdk_ext_directory)) {
       sdk_ext_directory += [ invoker.sdk_ext_directory ]
@@ -238,10 +224,7 @@
       stamp_file,
     ]
 
-    inputs = [
-               list_mojoms_script,
-               script,
-             ] + rebase_path(sources)
+    inputs = [ script ] + rebase_path(sources)
 
     args = [
              "--package-name",
@@ -258,11 +241,10 @@
              rebase_path(entries_file),
              "--package-sources",
            ] + rebase_path(sources) + [ "--package-entrypoints" ] +
-           rebase_path(entrypoints) + [ "--mojom-sources" ] +
-           rebase_path(mojom_sources, "", mojo_sdk_root) +
-           [ "--sdk-ext-directories" ] + rebase_path(sdk_ext_directory) +
-           [ "--sdk-ext-files" ] + rebase_path(sdk_ext_files) +
-           [ "--sdk-ext-mappings" ] + sdk_ext_mappings + extra_flags
+           rebase_path(entrypoints) + [ "--sdk-ext-directories" ] +
+           rebase_path(sdk_ext_directory) + [ "--sdk-ext-files" ] +
+           rebase_path(sdk_ext_files) + [ "--sdk-ext-mappings" ] +
+           sdk_ext_mappings + extra_flags
   }
 }
 

mojo/public/tools/dart_list_mojoms.py

diff --git a/mojo/public/tools/dart_list_mojoms.py b/mojo/public/tools/dart_list_mojoms.py
deleted file mode 100755
index ce27afd..0000000
--- a/mojo/public/tools/dart_list_mojoms.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/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.
-
-# This script scans a directory tree for any .mojom files and outputs a list.
-
-import argparse
-import os
-import sys
-
-def main(args):
-  parser = argparse.ArgumentParser(
-      description='Prints list of generated dart binding source files.')
-  parser.add_argument('source_directory',
-                      metavar='source_directory',
-                      help='Path to source directory tree containing .mojom'
-                           ' files')
-  parser.add_argument('relative_directory_root',
-                      metavar='relative_directory_root',
-                      help='Path to directory which all outputted paths will'
-                           'be relative to.')
-  args = parser.parse_args()
-  # Directory to start searching for .mojom files.
-  source_directory = args.source_directory
-  # Prefix to chop off output.
-  root_prefix = os.path.abspath(args.relative_directory_root)
-  for dirname, dirnames, filenames in os.walk(source_directory):
-    # filter for .mojom files.
-    filenames = [f for f in filenames if f.endswith('.mojom')]
-    # Skip any directories that start with 'test'.
-    dirnames[:] = [d for d in dirnames if not d.startswith('test')]
-    for f in filenames:
-      path = os.path.abspath(os.path.join(dirname, f))
-      path = os.path.relpath(path, root_prefix)
-      print(path)
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))
-

mojo/public/tools/dart_pkg.py

diff --git a/mojo/public/tools/dart_pkg.py b/mojo/public/tools/dart_pkg.py
index a00e67e..dd07246 100755
--- a/mojo/public/tools/dart_pkg.py
+++ b/mojo/public/tools/dart_pkg.py
@@ -19,13 +19,6 @@
 DART_ANALYZE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                             "dart_analyze.py")
 
-def mojom_dart_filter(path):
-  if os.path.isdir(path):
-    return True
-  # Don't include all .dart, just .mojom.dart.
-  return path.endswith('.mojom.dart')
-
-
 def dart_filter(path):
   if os.path.isdir(path):
     return True
@@ -34,13 +27,6 @@
   return ext == '.dart'
 
 
-def mojom_filter(path):
-  if os.path.isdir(path):
-    return True
-  _, ext = os.path.splitext(path)
-  return ext == '.mojom'
-
-
 def ensure_dir_exists(path):
   abspath = os.path.abspath(path)
   if not os.path.exists(abspath):
@@ -205,11 +191,6 @@
                       help='Package entry points for analyzer',
                       nargs='*',
                       default=[])
-  parser.add_argument('--mojom-sources',
-                      metavar='mojom_sources',
-                      help='.mojom and .mojom.dart sources',
-                      nargs='*',
-                      default=[])
   parser.add_argument('--sdk-ext-directories',
                       metavar='sdk_ext_directories',
                       help='Directory containing .dart sources',