From 2cd1e6fc2289fa591e336841cd81335a9802310e Mon Sep 17 00:00:00 2001 From: Jim Beveridge Date: Fri, 24 Apr 2015 15:03:47 -0700 Subject: [PATCH] Copy of Issue 1100753003, so I can roll Mojo to Modular. Add support for extra mojom dirs to deploy_sdk.py TBR=blundell Review URL: https://codereview.chromium.org/1102883003 --- engine/src/flutter/tools/deploy_sdk.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/tools/deploy_sdk.py b/engine/src/flutter/tools/deploy_sdk.py index 21e75cd1bd0..c510afedecb 100755 --- a/engine/src/flutter/tools/deploy_sdk.py +++ b/engine/src/flutter/tools/deploy_sdk.py @@ -115,6 +115,13 @@ def main(): 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') @@ -167,8 +174,10 @@ def main(): # 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'),