Stop to use contextmanager for goma.build_with_goma

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 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.
 
 import re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
@@ skipping 261 matching lines @@
       target_output_dir = self.m.path.abspath(
           self.m.path.join(self.m.path['checkout'], out_dir,
                            target or self.c.build_config_fs))
 
       command = [str(self.m.depot_tools.ninja_path), '-w', 'dupbuild=err',
                  '-C', target_output_dir]
 
       if self.c.compile_py.build_args:
         command.extend(self.c.compile_py.build_args)
 
-      if use_goma_module:
-        # Set -j just before 'with self.m.goma.build_with_goma('
-        # for ninja_log_command being set correctly if starting goma
-        # fails.
-        command += ['-j', self.m.goma.recommended_goma_jobs]
-
       if targets is not None:
         # Add build targets to command ('All', 'chrome' etc).
         command += targets
 
       kwargs.pop('env', {})
 
-      # TODO(tikuta): Set disable_local_fallback option appropriately.
       if use_goma_module:
         with self.m.goma.build_with_goma(
             env=goma_env,
             ninja_log_outdir=target_output_dir,
             ninja_log_compiler=self.c.compile_py.compiler or 'goma',
             ninja_log_command=command,
-            allow_build_without_goma=allow_build_without_goma):
-          if 'GOMA_DISABLED' in goma_env:
-            self.m.goma.remove_j_flag(command)
-            ninja_env['GOMA_DISABLED'] = 'true'
-            if self.m.platform.is_win:
-              self.m.python('update windows env',
-                            script=self.package_repo_resource(
-                                'scripts', 'slave', 'update_windows_env.py'),
-                            args=['--envfile-dir', str(target_output_dir)],
-                            env=goma_env)
+            allow_build_without_goma=allow_build_without_goma) as (
+                env_update, ninja_command):
+          ninja_env.update(env_update)
+          if self.m.platform.is_win and 'GOMA_DISABLED' in env_update:

[ukai, 2016/11/10 02:47:02]

edge case:
GOMA_DISABLED=false or GOMA_DISABLED=0 will run goma

(client/env_flags.cc GOMA_EnvToBool)

[tikuta, 2016/11/11 08:14:55]

Done.

+            goma_env.update(env_update)
+            self.m.python('update windows env',
+                          script=self.package_repo_resource(
+                              'scripts', 'slave', 'update_windows_env.py'),
+                          args=['--envfile-dir', str(target_output_dir)],
+                          env=goma_env)
           self.m.step(name or 'compile with ninja',
-                      command,
+                      ninja_command,
                       env=ninja_env,
                       **kwargs)
       else:
         self.m.step(name or 'compile with ninja',
                     command,
                     env=ninja_env,
                     **kwargs)
       return
 
     env = self.get_env()
@@ skipping 588 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))