goma: use GOMA_SERVICE_ACCOUNT_JSON_FILE (reland #1)

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 159 matching lines @@
     env['GOMA_COMPILER_INFO_CACHE_FILE'] = 'goma-compiler-info.cache'
 
   if options.build_data_dir:
     env['GOMA_DUMP_STATS_FILE'] = os.path.join(options.build_data_dir,
                                                'goma_stats_proto')
 
   # goma is requested.
   goma_key = os.path.join(options.goma_dir, 'goma.key')
   if os.path.exists(goma_key):
     env['GOMA_API_KEY_FILE'] = goma_key
+  if options.goma_service_account_json_file:
+    env['GOMA_SERVICE_ACCOUNT_JSON_FILE'] = \
+        options.goma_service_account_json_file
   if chromium_utils.IsWindows():
     env['GOMA_RPC_EXTRA_PARAMS'] = '?win'
   goma_start_command = ['restart'] if options.clobber else ['ensure_start']
   goma_ctl_cmd = [sys.executable,
                   os.path.join(options.goma_dir, 'goma_ctl.py')]
   result = chromium_utils.RunCommand(goma_ctl_cmd + goma_start_command, env=env)
   if not result:
     # goma started sucessfully.
     return True
 
@@ skipping 1068 matching lines @@
                            help='Enable goma remote link.')
   option_parser.add_option('--goma-enable-compiler-info-cache',
                            action='store_true',
                            help='Enable goma CompilerInfo cache')
   option_parser.add_option('--goma-store-local-run-output', default=None,
                            help='Store local run output to goma servers.')
   option_parser.add_option('--goma-fail-fast', action='store_true')
   option_parser.add_option('--goma-disable-local-fallback', action='store_true')
   option_parser.add_option('--goma-jsonstatus',
                            help='Specify a file to dump goma_ctl jsonstatus.')
+  option_parser.add_option('--goma-service-account-json-file',
+                           help='Specify a file containing goma service account'
+                                ' credentials')
   option_parser.add_option('--verbose', action='store_true')
   option_parser.add_option('--gsutil-py-path',
                            help='Specify path to gsutil.py script.')
   option_parser.add_option('--ninja-path', default='ninja',
                            help='Specify path to the ninja tool.')
   option_parser.add_option('--ninja-ensure-up-to-date', action='store_true',
                            help='Checks the output of the ninja builder to '
                                 'confirm that a second compile immediately '
                                 'the first is a no-op.')
 
@@ skipping 67 matching lines @@
       sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool))
       return 2
 
   options.target_output_dir = get_target_build_dir(args, options)
 
   return main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())