Pull in native_client and build tests.

mojo/tools/mojob.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.
 
 # This a simple script to make building/testing Mojo components easier.
 
 import argparse
 from copy import deepcopy
 import os
@@ skipping 34 matching lines @@
     elif args.goma and os.path.exists(goma_home_dir):
       additional_args['use_goma'] = True
       additional_args['goma_dir'] = goma_home_dir
     else:
       additional_args['use_goma'] = False
       additional_args['goma_dir'] = None
 
   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
 
   if 'builder_name' in args:
     additional_args['builder_name'] = args.builder_name
   if 'build_number' in args:
     additional_args['build_number'] = args.build_number
   if 'master_name' in args:
     additional_args['master_name'] = args.master_name
   if 'test_results_server' in args:
@@ skipping 28 matching lines @@
 
   if config.values['use_goma']:
     gn_args.append('use_goma=true')
     gn_args.append(r'''goma_dir=\"%s\"''' % config.values['goma_dir'])
   else:
     gn_args.append('use_goma=false')
 
   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:
     gn_args.append(r'''os=\"chromeos\" ui_base_build_ime=false
                    use_system_harfbuzz=false''')
 
   out_dir = _get_out_dir(config)
   command.append(out_dir)
   command.append('--args="%s"' % ' '.join(gn_args))
 
@@ skipping 96 matching lines @@
 
   sync_parser = subparsers.add_parser('sync', parents=[parent_parser],
       help='Sync using gclient (does not run gn).')
   sync_parser.set_defaults(func=sync)
 
   gn_parser = subparsers.add_parser('gn', parents=[parent_parser],
                                     help='Run gn for mojo (does not sync).')
   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')
   clang_group.add_argument('--gcc', help='Use GCC',
                            dest='clang', action='store_false')
   goma_group = gn_parser.add_mutually_exclusive_group()
   goma_group.add_argument('--goma',
                           help='Use Goma (if $GOMA_DIR is set or $HOME/goma '
                                'exists; default)',
                           default=True,
@@ skipping 35 matching lines @@
       help='Run Dart unit tests (does not build).')
   darttest_parser.set_defaults(func=darttest)
 
   args = parser.parse_args()
   config = _args_to_config(args)
   return args.func(config)
 
 
 if __name__ == '__main__':
   sys.exit(main())