Index: tools/mb/mb_config.pyl |
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl |
index fa9dd827da2b40de86d1188d3bf2223efcd43a93..934ac2bf53f6f7519e608cc808953cfb6eba93a5 100644 |
--- a/tools/mb/mb_config.pyl |
+++ b/tools/mb/mb_config.pyl |
@@ -52,14 +52,10 @@ |
'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'], |
'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'], |
'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'], |
- 'gyp_release_bot_arm': ['gyp', 'release_bot', 'arm', 'crosscompile'], |
'gyp_release_trybot': ['gyp', 'release_trybot'], |
'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'], |
'libfuzzer_upload_bot': ['gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs'], |
- # This is just for completeness; any bot that uses this config should never actually run MB. |
- 'none': ['none'], |
- |
'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'], |
'noswarming_gyp_release_bot_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'linux_dump_symbols'], |
'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'], |
@@ -78,8 +74,8 @@ |
'swarming_gyp_debug_bot_no_symbols_x86': ['swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86'], |
'swarming_gyp_debug_trybot_x86': ['swarming', 'gyp', 'debug_trybot', 'x86'], |
'swarming_gyp_release_bot': ['swarming', 'gyp', 'release_bot'], |
+ 'swarming_gyp_release_bot_arm': ['swarming', 'gyp', 'release_bot', 'arm', 'crosscompile'], |
'swarming_gyp_release_trybot_arm': ['swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile'], |
- 'swarming_gyp_release_trybot_arm_float': ['swarming', 'gyp', 'release_trybot', 'arm_float', 'crosscompile'], |
'swarming_tsan_gyp_release_trybot': ['swarming', 'disable_nacl', 'tsan', 'gyp', 'release_trybot'], |
# clang/win doesn't work with goma yet, so this can't use debug_bot: |
@@ -127,11 +123,6 @@ |
'gyp_defines': 'target_arch=arm64', |
}, |
- 'arm_float': { |
- 'gn_args': 'error', |
- 'gyp_defines': 'target_arch=arm arm_float_abi=hard', |
- }, |
- |
'arm64': { |
'gn_args': 'target_cpu="arm64"', |
'gyp_defines': 'target_arch=arm64', |
@@ -273,15 +264,6 @@ |
'gyp_defines': 'fastbuild=2', |
}, |
- # This config is used by bots that aren't building Chromium and should |
- # never be running MB. It is used for tracking purposes. These values |
- # were picked such that if someone did try to run MB, both GN and GYP |
- # should error out. |
- 'none': { |
- 'gn_args': 'error', |
- 'gyp_defines': 'target_arch=unknown', |
- }, |
Dirk Pranke
2015/11/21 00:38:05
actually, I'd like to leave this block in. Did the
Sam Clegg
2015/11/21 00:43:46
Yes, presubmit told me to do it.
Done.
|
- |
'noswarming': { |
'gn_args': '', |
'gyp_defines': 'test_isolation_mode=noop', |
@@ -445,7 +427,7 @@ |
'Libfuzzer Upload Linux': 'libfuzzer_upload_bot', |
'Site Isolation Linux': 'gn_release_trybot', |
'Site Isolation Win': 'gyp_release_trybot_x64', |
- 'Linux ARM': 'gyp_release_bot_arm', |
+ 'Linux ARM': 'swarming_gyp_release_bot_arm', |
}, |
'chromium.webrtc.fyi': { |
'Android GN': 'android_gn_release_bot', |
@@ -507,8 +489,6 @@ |
'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot', |
'linux_chromium_practice_rel_ng': 'gyp_release_trybot', |
'linux_arm_compile': 'swarming_gyp_release_trybot_arm', |
- 'linux_arm': 'swarming_gyp_release_trybot_arm_float', |
- 'linux_arm_tester': 'none', |
'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86', |
'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86', |
'linux_chromium_archive_rel_ng': 'noswarming_gyp_release_bot_linux_dump_symbols', |