Copy of Issue 1100753003, so I can roll Mojo to Modular.

sky/tools/deploy_sdk.py

 #!/usr/bin/env 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.
 
 import argparse
 from datetime import datetime
 import logging
 import os
 import shutil
@@ skipping 97 matching lines @@
         else:
             os.remove(path)
 
 
 def main():
     logging.basicConfig(level=logging.WARN)
     parser = argparse.ArgumentParser(description='Deploy a new sky_sdk.')
     parser.add_argument('sdk_root', type=str)
     parser.add_argument('--build-dir', action='store', type=str,
         default=os.path.join(SRC_ROOT, DEFAULT_REL_BUILD_DIR))
+    parser.add_argument('--extra-mojom-dir', action='append',
+                        type=str,
+                        dest='extra_mojom_dirs',
+                        metavar='EXTRA_MOJOM_DIR',
+                        help='Extra root directory for mojom packages. '
+                             'Can be specified multiple times.',
+                        default=[])
     parser.add_argument('--non-interactive', action='store_true')
     parser.add_argument('--dev-environment', action='store_true')
     parser.add_argument('--commit', action='store_true')
     parser.add_argument('--fake-pub-get-into', action='store', type=str)
     args = parser.parse_args()
 
     build_dir = os.path.abspath(args.build_dir)
     sdk_root = os.path.abspath(args.sdk_root)
 
     print 'Building SDK from %s into %s' % (build_dir, sdk_root)
@@ skipping 32 matching lines @@
     copy_or_link(src_path('sky/engine/bindings/builtin.dart'),
         sdk_path('packages/sky/sdk_additions/dart_sky_builtins.dart'))
     bindings_path = os.path.join(build_dir, 'gen/sky/bindings')
     # dart_sky.dart has many supporting files:
     copy(bindings_path, sdk_path('packages/sky/sdk_additions'),
         dart_filter)
 
     # Mojo package, lots of overlap with gen, must be copied:
     copy(src_path('mojo/public'), sdk_path('packages/mojo/lib/public'),
         dart_filter)
-    copy(os.path.join(build_dir, 'gen/dart-gen/mojom'),
-        sdk_path('packages/mojom/lib/'), gen_filter)
+    mojom_dirs = [ os.path.join(build_dir, 'gen/dart-gen/mojom') ]
+    mojom_dirs += args.extra_mojom_dirs
+    for mojom_dir in mojom_dirs:
+      copy(mojom_dir, sdk_path('packages/mojom/lib/'), gen_filter)
 
     # Mojo SDK additions:
     copy_or_link(src_path('mojo/public/dart/bindings.dart'),
         sdk_path('packages/mojo/sdk_additions/dart_mojo_bindings.dart'))
     copy_or_link(src_path('mojo/public/dart/core.dart'),
         sdk_path('packages/mojo/sdk_additions/dart_mojo_core.dart'))
 
     if not skip_apks:
         ensure_dir_exists(sdk_path('packages/sky/apks'))
         shutil.copy(os.path.join(build_dir, 'apks', 'SkyDemo.apk'),
@@ skipping 34 matching lines @@
             'git', 'commit',
             '-m', commit_message
             ], cwd=sdk_root)
 
     time_delta = datetime.now() - start_time
     print 'SDK built at %s in %ss' % (sdk_root, time_delta.total_seconds())
 
 
 if __name__ == '__main__':
     main()