Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Unified Diff: mojo/tools/mojob.py

Issue 840653003: Pull in native_client and build tests. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/nacl/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/mojob.py
diff --git a/mojo/tools/mojob.py b/mojo/tools/mojob.py
index 9419ce50bd8102e6c94aea7373c9287d56c60e10..ff1cb285816caa8ef57e921b0642451b03643dbc 100755
--- a/mojo/tools/mojob.py
+++ b/mojo/tools/mojob.py
@@ -52,6 +52,9 @@ def _args_to_config(args):
if 'with_dart' in args:
additional_args['with_dart'] = args.with_dart
+ if 'nacl' in args:
+ additional_args['use_nacl'] = args.nacl
+
if 'dry_run' in args:
additional_args['dry_run'] = args.dry_run
@@ -100,6 +103,9 @@ def gn(config):
if config.values['with_dart']:
gn_args.append('mojo_use_dart=true')
+ if config.values['use_nacl']:
+ gn_args.append('mojo_use_nacl=true')
+
if config.target_os == Config.OS_ANDROID:
gn_args.append(r'''os=\"android\" cpu_arch=\"arm\"''')
elif config.target_os == Config.OS_CHROMEOS:
@@ -216,6 +222,7 @@ def main():
gn_parser.set_defaults(func=gn)
gn_parser.add_argument('--with-dart', help='Configure the Dart bindings',
action='store_true')
+ gn_parser.add_argument('--nacl', help='Add in NaCl', action='store_true')
clang_group = gn_parser.add_mutually_exclusive_group()
clang_group.add_argument('--clang', help='Use Clang (default)', default=None,
action='store_true')
« no previous file with comments | « mojo/nacl/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698