Simplify config for Clang ToT builders.

scripts/slave/recipe_modules/chromium/config.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 pipes
 
 from recipe_engine.config import config_item_context, ConfigGroup
 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf
 from recipe_engine.config_types import Path
 
@@ skipping 499 matching lines @@
   dcheck(c, optional=True)
 
 @config_ctx()
 def gn_component_build(c):
   c.gn_args.append('is_component_build=true')
 
 @config_ctx()
 def gn_minimal_symbols(c):
   c.gn_args.append('symbol_level=1')
 
+@config_ctx()
+def clang_tot(c):
+  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  # Plugin flags often need to be changed when using a plugin newer than
+  # the latest Clang package, so disable plugins.
+  # TODO(pcc): Investigate whether this should be consistent between Windows and
+  # non-Windows.
+  if c.TARGET_PLATFORM != 'win':
+    c.gyp_env.GYP_DEFINES['clang_use_chrome_plugins'] = 0
+
 #### 'Full' configurations
 @config_ctx(includes=['ninja', 'default_compiler'])
 def chromium_no_goma(c):
   c.compile_py.default_targets = ['All', 'chromium_builder_tests']
 
 @config_ctx(includes=['ninja', 'default_compiler', 'goma'])
 def chromium(c):
   c.compile_py.default_targets = ['All', 'chromium_builder_tests']
   c.cros_sdk.external = True
 
 @config_ctx(includes=['ninja', 'clang'])  # Intentionally no goma yet.
 def chromium_win_clang(c):
   fastbuild(c, final=False)  # final=False so win_clang_asan can override it.
 
-@config_ctx(includes=['chromium_win_clang'])
+@config_ctx(includes=['chromium_win_clang', 'clang_tot'])
 def chromium_win_clang_tot(c):
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  pass
 
 @config_ctx(includes=['chromium_win_clang', 'official'])
 def chromium_win_clang_official(c):
   pass
 
-@config_ctx(includes=['chromium_win_clang', 'official'])
+@config_ctx(includes=['chromium_win_clang', 'official', 'clang_tot'])
 def chromium_win_clang_official_tot(c):
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  pass
 
 @config_ctx(includes=['chromium_win_clang', 'asan', 'static_library'])
 def chromium_win_clang_asan(c):
   # These are set on the lkgr bot, and the fyi bots should match the lkgr bot.
   # TODO(thakis): Once the lkgr bot uses recipes, the lkgr and the fyi bots
   # should use the same context to ensure they use the same gyp defines.
   c.gyp_env.GYP_DEFINES['enable_ipc_fuzzer'] = 1
   c.gyp_env.GYP_DEFINES['v8_enable_verify_heap'] = 1
 
-@config_ctx(includes=['chromium_win_clang_asan'])
+@config_ctx(includes=['chromium_win_clang_asan', 'clang_tot'])
 def chromium_win_clang_asan_tot(c):
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  pass
 
 @config_ctx(includes=['chromium_win_clang_asan_tot', 'sanitizer_coverage'])
 def chromium_win_clang_asan_tot_coverage(c):
   pass
 
 @config_ctx(includes=['chromium_win_clang', 'goma'])
 def chromium_win_clang_goma(c):
   pass
 
-@config_ctx(includes=['ninja', 'clang'])  # No goma.
+@config_ctx(includes=['ninja', 'clang', 'clang_tot'])  # No goma.
 def clang_tot_linux(c):
-  # Use ToT Clang.
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  pass
 
-@config_ctx(includes=['ninja', 'clang'])  # No goma.
+@config_ctx(includes=['ninja', 'clang', 'clang_tot'])  # No goma.
 def clang_tot_mac(c):
-  # Use ToT Clang and fastbuild.
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
   c.gyp_env.GYP_DEFINES['fastbuild'] = 1
 
 @config_ctx()
 def asan_test_batch(c):
   c.runtests.test_args.append('--test-launcher-batch-limit=1')
 
 @config_ctx(includes=['clang_tot_linux', 'asan', 'chromium_sanitizer',
                       'asan_test_batch'])
 def clang_tot_linux_asan(c):
   # Like chromium_linux_asan, without goma.
   pass
 
 @config_ctx(includes=['clang_tot_linux', 'ubsan_vptr', 'sanitizer_coverage'])
 def clang_tot_linux_ubsan_vptr(c):
   pass
 
 @config_ctx(includes=['clang_tot_mac', 'asan', 'chromium_sanitizer',
             'static_library'])
 def clang_tot_mac_asan(c):
   # Like chromium_mac_asan, without goma.
   # Clear lsan configuration for mac.
   del c.gyp_env.GYP_DEFINES['lsan']
 
-@config_ctx(includes=['android_common', 'ninja', 'clang', 'asan'])
+@config_ctx(includes=['android_common', 'ninja', 'clang', 'asan', 'clang_tot'])
 def clang_tot_android_asan(c):
   # Like android_clang, minus goma, minus static_libarary, plus asan.
-  # Use ToT Clang.
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  pass
 
 # GYP_DEFINES must not include 'asan' or 'clang', else the tester bot will try
 # to compile clang.
 @config_ctx(includes=['chromium_no_goma'])
 def chromium_win_asan(c):
   c.runtests.run_asan_test = True
 
 @config_ctx()
 def chromium_sanitizer(c):
   c.runtests.test_args.append('--test-launcher-print-test-stdio=always')
@@ skipping 76 matching lines @@
   c.gyp_env.GYP_GENERATOR_FLAGS['xcode_project_version'] = '3.2'
 
 @config_ctx(includes=['ios', 'ninja'])
 def chromium_ios_ninja(c):
   c.build_config_fs += '-iphoneos'
   c.compile_py.default_targets = ['All']
 
   gyp_defs = c.gyp_env.GYP_DEFINES
   gyp_defs['clang_xcode'] = 0
 
-@config_ctx(includes=['chromium_ios_ninja'])
+@config_ctx(includes=['chromium_ios_ninja', 'clang_tot'])
 def clang_tot_ios(c):
-  # Use ToT Clang.
-  c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
+  pass
 
 @config_ctx(includes=['chromium', 'official'])
 def chromium_official(c):
   # TODO(phajdan.jr): Unify compile targets used by official builders.
   if c.TARGET_PLATFORM == 'win':
     c.compile_py.default_targets = ['chrome_official_builder']
   elif c.TARGET_PLATFORM in ['linux', 'mac']:
     c.compile_py.default_targets = []
 
 @config_ctx(includes=['chromium'])
@@ skipping 100 matching lines @@
     c.compile_py.goma_dir = None
     c.gyp_env.GYP_DEFINES['use_goma'] = 0
 
 @config_ctx()
 def chromium_deterministic_build(c):
   c.gyp_env.GYP_DEFINES['dont_embed_build_metadata'] = 1
 
 @config_ctx(includes=['chromium_clang'])
 def cast_linux(c):
   c.gyp_env.GYP_DEFINES['chromecast'] = 1