Add explicit compile targets to all Win and ToT Clang builders

scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
index db8c65c9d776a571e525d553cfde43e516773b1d..158b7178a68c8902029cd43341ab570071ae5c88 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
@@ -376,15 +376,15 @@ SPEC = {
         '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',
@@ -410,6 +410,9 @@ SPEC = {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
+      'compile_targets': [
+        'all'
+      ],
       # Recipes builds Debug builds with component=shared_library by default.
       'bot_type': 'builder',
       'testing': {
@@ -417,9 +420,6 @@ SPEC = {
       },
       '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',
@@ -445,6 +445,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': {
@@ -452,9 +455,6 @@ SPEC = {
       },
       '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',
@@ -481,15 +481,15 @@ SPEC = {
         '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',
@@ -516,6 +516,9 @@ SPEC = {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       # Recipes builds Debug builds with component=shared_library by default.
       'bot_type': 'builder',
       'testing': {
@@ -524,9 +527,6 @@ SPEC = {
       # 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',
@@ -553,6 +553,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': {
@@ -560,9 +563,6 @@ SPEC = {
       },
       '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',
@@ -588,6 +588,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
@@ -595,9 +598,6 @@ SPEC = {
       },
       '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',
@@ -623,6 +623,9 @@ SPEC = {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
@@ -630,9 +633,6 @@ SPEC = {
       },
       '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',
@@ -658,6 +658,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
@@ -665,9 +668,6 @@ SPEC = {
       },
       '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',
@@ -693,6 +693,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library', 'use_lld': 1 },
       'bot_type': 'builder',
       'testing': {
@@ -700,9 +703,6 @@ SPEC = {
       },
       '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',
@@ -762,6 +762,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': { 'component': 'shared_library' },
       'bot_type': 'builder',
       'testing': {
@@ -1059,6 +1062,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': {
         'component': 'shared_library',
         'werror': '',
@@ -1080,9 +1086,6 @@ SPEC = {
       },
       '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',
@@ -1110,6 +1113,9 @@ SPEC = {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': {
         'werror': '',
 
@@ -1124,9 +1130,6 @@ SPEC = {
       },
       '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',
@@ -1136,6 +1139,9 @@ SPEC = {
         '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
@@ -1149,9 +1155,6 @@ SPEC = {
       },
       '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',
@@ -1181,6 +1184,9 @@ SPEC = {
         'TARGET_ARCH': 'arm',
         'TARGET_BITS': 32,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': {
         'component': 'shared_library',
         'werror': '',
@@ -1191,9 +1197,6 @@ SPEC = {
       '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',
@@ -1230,6 +1233,9 @@ SPEC = {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
+      'compile_targets': [
+        'all'
+      ],
       'GYP_DEFINES': {
         'component': 'shared_library',
         'werror': '',
@@ -1244,9 +1250,6 @@ SPEC = {
       },
       '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',
@@ -1274,6 +1277,9 @@ SPEC = {
         '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
@@ -1287,9 +1293,6 @@ SPEC = {
       },
       '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',
@@ -1298,6 +1301,9 @@ SPEC = {
         '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
@@ -1311,9 +1317,6 @@ SPEC = {
       },
       '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',
@@ -1343,6 +1346,9 @@ SPEC = {
       '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
@@ -1361,14 +1367,14 @@ SPEC = {
         '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',
@@ -1390,14 +1396,14 @@ SPEC = {
         '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',
@@ -1419,15 +1425,15 @@ SPEC = {
         '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',
@@ -1450,14 +1456,14 @@ SPEC = {
         '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',
@@ -1479,14 +1485,14 @@ SPEC = {
         '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',
@@ -1508,15 +1514,15 @@ SPEC = {
         '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',