Use [CACHE]/cipd/goma for goma_dir in recipes/chromium_codesearch.py

scripts/slave/recipes/chromium_codesearch.py

Index: scripts/slave/recipes/chromium_codesearch.py
diff --git a/scripts/slave/recipes/chromium_codesearch.py b/scripts/slave/recipes/chromium_codesearch.py
index 6fcb3e29366914cf39e78312408945b4802c5782..beb12115808c38e07dc75a5b5b16d050ca251434 100644
--- a/scripts/slave/recipes/chromium_codesearch.py
+++ b/scripts/slave/recipes/chromium_codesearch.py
@@ -45,10 +45,8 @@ LINUX_GN_ARGS = [
   'is_clang=true',
   'is_component_build=true',
   'is_debug=true',
-  'goma_dir="/b/build/goma"',
   'symbol_level=1',
   'target_cpu="x64"',
-  'use_goma=true',
 ]
 
 CHROMEOS_GN_ARGS = LINUX_GN_ARGS + [
@@ -103,6 +101,9 @@ def GenerateCompilationDatabase(api, debug_path, targets, platform):
   # adjusted.
   gn_path = api.path['checkout'].join('buildtools', 'linux64', 'gn')
   args = LINUX_GN_ARGS if platform == 'linux' else CHROMEOS_GN_ARGS
+  if (hasattr(api.chromium.c.compile_py, 'goma_dir') and
+      api.chromium.c.compile_py.goma_dir):
+    args.append('use_goma=true')

[ukai, 2016/09/14 04:10:06]

also add goma_dir?

[tikuta, 2016/09/14 04:13:57]

Done.

   command = [gn_path, 'gen', debug_path, '--args=%s' % ' '.join(args)]
   api.step('generate build files for %s' % platform, command,
            cwd=api.path['checkout'])
@@ -140,6 +141,7 @@ def RunSteps(api):
   debug_path = api.path['checkout'].join('out', 'Debug')
   targets = bot_config.get('compile_targets', [])
   api.chromium.set_config('codesearch', BUILD_CONFIG='Debug')
+  api.chromium.ensure_goma()
   api.chromium.runhooks()
 
   result = GenerateCompilationDatabase(api, debug_path, targets, platform)