mojob.py: explicitly select CPU architecture.

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
 import platform
 import re
 import subprocess
 import sys
 
 from get_test_list import GetTestList
 from mopy.config import Config
 from mopy.paths import Paths
 
 
 def _args_to_config(args):
   # Default to host OS.
   target_os = None
   if args.android:
     target_os = Config.OS_ANDROID
   elif args.chromeos:
     target_os = Config.OS_CHROMEOS
 
+  if args.cpu_arch is None and args.android:
+    args.cpu_arch = 'arm'
+  target_arch = args.cpu_arch
+
   additional_args = {}
 
   if 'clang' in args:
     additional_args['is_clang'] = args.clang
 
   if 'asan' in args and args.asan:
     additional_args['sanitizer'] = Config.SANITIZER_ASAN
 
   # Additional non-standard config entries:
 
   if 'goma' in args:
     goma_dir = os.environ.get('GOMA_DIR')
     goma_home_dir = os.path.join(os.getenv('HOME', ''), 'goma')
     if args.goma and goma_dir:
       additional_args['use_goma'] = True
       additional_args['goma_dir'] = goma_dir
     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
+  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:
     additional_args['test_results_server'] = args.test_results_server
 
-  return Config(target_os=target_os, is_debug=args.debug, **additional_args)
+  return Config(target_os=target_os, target_arch=target_arch,
+                is_debug=args.debug, **additional_args)
 
 
 def _get_out_dir(config):
   paths = Paths(config)
   return paths.SrcRelPath(paths.build_dir)
 
 
 def sync(config):
   # pylint: disable=W0613
   return subprocess.call(['gclient', 'sync'])
@@ skipping 19 matching lines @@
   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\"''')
+    gn_args.append(r'''os=\"android\"''')
   elif config.target_os == Config.OS_CHROMEOS:
     gn_args.append(r'''os=\"chromeos\" ui_base_build_ime=false
                    use_system_harfbuzz=false''')
 
+  gn_args.append(r'''cpu_arch=\"%s\"''' % config.target_arch)

[viettrungluu, 2015/01/12 23:26:40]

nit: add blank line below

[Nick Bray (chromium), 2015/01/13 00:05:20]

Done.

   out_dir = _get_out_dir(config)
   command.append(out_dir)
   command.append('--args="%s"' % ' '.join(gn_args))
 
   print 'Running %s ...' % ' '.join(command)
   return subprocess.call(' '.join(command), shell=True)
 
 
 def _get_gn_arg_value(out_dir, arg):
   args_file_path = os.path.join(out_dir, 'args.gn')
@@ skipping 79 matching lines @@
                            default=True, action='store_true')
   debug_group.add_argument('--release', help='Release build', default=False,
                            dest='debug', action='store_false')
 
   os_group = parent_parser.add_mutually_exclusive_group()
   os_group.add_argument('--android', help='Build for Android',
                         action='store_true')
   os_group.add_argument('--chromeos', help='Build for ChromeOS',
                         action='store_true')
 
+  nacl_parser = parent_parser.add_argument_group()
+  nacl_parser.add_argument('--nacl', help='Add in NaCl', default=False,

[viettrungluu, 2015/01/12 23:26:40]

These should just be added to parent_parser.

[Nick Bray (chromium), 2015/01/13 00:05:20]

Done.

+                           action='store_true')
+  nacl_parser.add_argument('--cpu-arch', help='CPU architecture to build for.',
+                           choices=['x64', 'x86', 'arm'])
+
   subparsers = parser.add_subparsers()
 
   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())