Revert of Add explicit compile targets to all Win and ToT Clang builders

scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py

 # 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.
 
 from . import steps
 
 RESULTS_URL = 'https://chromeperf.appspot.com'
 
 SPEC = {
   'settings': {
@@ skipping 358 matching lines @@
       },
     },
     'CrWinClang': {
       'chromium_config': 'chromium_win_clang_official',
       'gclient_config': 'chromium',
       'gclient_apply_config': ['chrome_internal'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClang tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClang',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClang(dbg)': {
       'chromium_config': 'chromium_win_clang',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       # Recipes builds Debug builds with component=shared_library by default.
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClang(dbg) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClang(dbg)',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClang(shared)': {
       'chromium_config': 'chromium_win_clang',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClang(shared) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClang(shared)',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClang64': {
       'chromium_config': 'chromium_win_clang_official',
       'gclient_config': 'chromium',
       'gclient_apply_config': ['chrome_internal'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClang64 tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClang64',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClang64(dbg)': {
       'chromium_config': 'chromium_win_clang',
       'chromium_apply_config': ['mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       # Recipes builds Debug builds with component=shared_library by default.
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       # TODO(thakis): Reenable when swarming works in gn http://crbug.com/480053
       #'use_isolate': True,
       #'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClang64(dbg) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClang64(dbg)',
       'testing': {
         'platform': 'win',
       },
       # TODO(thakis): Reenable when swarming works in gn http://crbug.com/480053
       #'enable_swarming': True,
     },
     'CrWinClang64(dll)': {
       'chromium_config': 'chromium_win_clang',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClang64(dll) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClang64(dll)',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClangLLD': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClangLLD tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClangLLD',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClngLLDdbg': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClngLLDdbg tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClngLLDdbg',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClangLLD64': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClangLLD64 tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'CrWinClangLLD64',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'CrWinClngLLD64dbg': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'CrWinClngLLD64dbg tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
@@ skipping 39 matching lines @@
       },
       'enable_swarming': True,
     },
     'CrWinAsan(dll)': {
       'chromium_config': 'chromium_win_clang_asan_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': {
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
       'compile_targets': [ 'chromium_builder_asan' ],
       # add_tests_as_compile_targets not needed for the asan bot, it doesn't
       # build everything.
@@ skipping 277 matching lines @@
         'platform': 'mac'
       }
     },
     'ClangToTLinux': {
       'chromium_config': 'clang_tot_linux',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'component': 'shared_library',
         'werror': '',
 
         # Enable debug info, as on official builders, to catch issues with
         # optimized debug info.
         'linux_dump_symbols': '1',
 
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'testing': {
         'platform': 'linux',
       },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTLinux')
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTLinux tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTLinux',
       'testing': {
         'platform': 'linux',
       },
       'enable_swarming': True,
     },
     'ClangToTLinux (dbg)': {
       'chromium_config': 'clang_tot_linux',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'werror': '',
 
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'testing': { 'platform': 'linux', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTLinux (dbg)')
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTLinuxASan': {
       'chromium_config': 'clang_tot_linux_asan',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'chromium_apply_config': ['lsan'],
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'werror': '',
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'testing': { 'platform': 'linux', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTLinuxASan')
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTLinuxASan tester': {
       'chromium_config': 'chromium_linux_asan',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'chromium_apply_config': ['lsan'],
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTLinuxASan',
       'testing': { 'platform': 'linux', },
       'enable_swarming': True,
     },
     'ClangToTAndroidASan': {
       'chromium_config': 'clang_tot_android_asan',
       'gclient_config': 'chromium',
       'gclient_apply_config': ['android'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_PLATFORM': 'android',
         'TARGET_ARCH': 'arm',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'component': 'shared_library',
         'werror': '',
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'android_config': 'clang_asan_tot_release_builder',
       'testing': { 'platform': 'linux', },
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTAndroidASan tester': {
       'chromium_config': 'clang_tot_android_asan',
       'gclient_config': 'chromium',
       'gclient_apply_config': ['android'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
         'TARGET_PLATFORM': 'android',
       },
@@ skipping 16 matching lines @@
         'platform': 'linux',
       },
     },
     'ClangToTMac': {
       'chromium_config': 'clang_tot_mac',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'component': 'shared_library',
         'werror': '',
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'testing': { 'platform': 'mac', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTMac')
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTMac tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTMac',
       'testing': {
         'platform': 'mac',
       },
       'enable_swarming': True,
     },
     'ClangToTMac (dbg)': {
       'chromium_config': 'clang_tot_mac',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'werror': '',
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'testing': { 'platform': 'mac', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTMac (dbg)')
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTMacASan': {
       'chromium_config': 'clang_tot_mac_asan',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'werror': '',
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'bot_type': 'builder',
       'testing': { 'platform': 'mac', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTMacASan')
       },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTMacASan tester': {
       'chromium_config': 'chromium_mac_asan',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTMacASan',
       'testing': { 'platform': 'mac', },
       'enable_swarming': True,
     },
     'ClangToTiOS': {
       'chromium_config': 'clang_tot_ios',
       'gclient_config': 'ios',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_PLATFORM': 'ios',
         'TARGET_BITS': 32,
       },
       'gclient_config_kwargs': {
         'GIT_MODE': True,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': {
         'werror': '',
         # Plugin flags often need to be changed when using a plugin newer than
         # the latest Clang package, so disable plugins.
         'clang_use_chrome_plugins': '0',
       },
       'testing': {
         'platform': 'mac',
       }
     },
     'ClangToTWin': {
       'chromium_config': 'chromium_win_clang_official_tot',
       'gclient_config': 'chromium',
       'gclient_apply_config': ['chrome_internal'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'bot_type': 'builder',
       'testing': { 'platform': 'win', },
       'tests': { steps.SizesStep(RESULTS_URL, 'ClangToTWin') },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTWin tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'test_generators': [steps.generate_gtest],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTWin',
       'testing': { 'platform': 'win' },
       'enable_swarming': True,
     },
     'ClangToTWin(dbg)': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'bot_type': 'builder',
       'testing': { 'platform': 'win', },
       'tests': { steps.SizesStep(RESULTS_URL, 'ClangToTWin(dbg)') },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTWin(dbg) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
       'test_generators': [steps.generate_gtest],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTWin(dbg)',
       'testing': { 'platform': 'win' },
       'enable_swarming': True,
     },
     'ClangToTWin(dll)': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': { 'platform': 'win', },
       'tests': { steps.SizesStep(RESULTS_URL, 'ClangToTWin(dll)') },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTWin(dll) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'test_generators': [steps.generate_gtest],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTWin(dll)',
       'testing': { 'platform': 'win' },
       'enable_swarming': True,
     },
     'ClangToTWin64': {
       'chromium_config': 'chromium_win_clang_official_tot',
       'gclient_config': 'chromium',
       'gclient_apply_config': ['chrome_internal'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'bot_type': 'builder',
       'testing': { 'platform': 'win', },
       'tests': { steps.SizesStep(RESULTS_URL, 'ClangToTWin64') },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTWin64 tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [steps.generate_gtest],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTWin64',
       'testing': { 'platform': 'win' },
       'enable_swarming': True,
     },
     'ClangToTWin64(dbg)': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'bot_type': 'builder',
       'testing': { 'platform': 'win', },
       'tests': { steps.SizesStep(RESULTS_URL, 'ClangToTWin64(dbg)') },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTWin64(dbg) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'test_generators': [steps.generate_gtest],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTWin64(dbg)',
       'testing': { 'platform': 'win' },
       'enable_swarming': True,
     },
     'ClangToTWin64(dll)': {
       'chromium_config': 'chromium_win_clang_tot',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
-      'compile_targets': [
-        'all'
-      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': { 'platform': 'win', },
       'tests': { steps.SizesStep(RESULTS_URL, 'ClangToTWin64(dll)') },
       'use_isolate': True,
       'enable_swarming': True,
+      # Workaround so that recipes doesn't add random build targets to our
+      # compile line. We want to build everything.
+      'add_tests_as_compile_targets': False,
     },
     'ClangToTWin64(dll) tester': {
       'chromium_config': 'chromium_no_goma',
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [steps.generate_gtest],
       'bot_type': 'tester',
@@ skipping 297 matching lines @@
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'testing': {
         'platform': 'linux',
       },
     },
   },
 }