Commit a5a29eae authored by dpranke's avatar dpranke Committed by Commit bot

Flip remaining builders to GN.

(Apart from the dedicated GYP builders, of course).

This affects:

- chromium.fyi
  - Closure Compilation Linux
  - CrWinAsan
  - CrWinAsan(dll)
  - CrWinAsanCov
- chromium.lkgr
  - Win ASan Release Coverage
  - Win ASan Release Media
  - Win ASan Release
- chromium.mac
  - ios-simulator
- chromium.memory.full
  - Chromium Windows Builder (DrMemory x64)
  - Chromium Windows Builder (DrMemory)
- tryserver.chromium.linux
  - closure_compilation
- tryserver.chromium.mac
  - ios-simulator

Though the closure compilation builder doesn't really use GN or MB yet.

TBR=brettw@chromium.org
BUG=605318, 621708

Review-Url: https://codereview.chromium.org/2198693002
Cr-Commit-Position: refs/heads/master@{#408890}
parent b04cd370
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"comments": [ "comments": [
"Tests for 32- and 64-bit iOS 9.0 simulators.", "Tests for 32- and 64-bit iOS 9.0 simulators.",
"Tests run on iPhone 5s (64-bit) and iPad Retina (32-bit).", "Tests run on iPhone 5s (64-bit) and iPad Retina (32-bit).",
"Build is performed with gyp+ninja." "Build is performed with gn+ninja."
], ],
"xcode version": "7.0", "xcode version": "7.0",
"GYP_DEFINES": [ "GYP_DEFINES": [
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"target_cpu=\"x64\"", "target_cpu=\"x64\"",
"additional_target_cpus=[\"x86\"]" "additional_target_cpus=[\"x86\"]"
], ],
"mb_type": "gyp", "mb_type": "gn",
"compiler": "ninja", "compiler": "ninja",
"configuration": "Debug", "configuration": "Debug",
"sdk": "iphonesimulator9.0", "sdk": "iphonesimulator9.0",
......
...@@ -186,13 +186,13 @@ ...@@ -186,13 +186,13 @@
'ClangToTiOS': 'ios_gn', 'ClangToTiOS': 'ios_gn',
'Closure Compilation Linux': 'closure_compilation', 'Closure Compilation Linux': 'closure_compilation',
'CrWinAsan': 'CrWinAsan':
'swarming_gyp_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release', 'swarming_gn_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release',
'CrWinAsan tester': 'none', 'CrWinAsan tester': 'none',
'CrWinAsan(dll)': 'CrWinAsan(dll)':
'swarming_gyp_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release', 'swarming_gn_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release',
'CrWinAsan(dll) tester': 'none', 'CrWinAsan(dll) tester': 'none',
'CrWinAsanCov': 'CrWinAsanCov':
('swarming_gyp_asan_clang_edge_fuzzer' ('swarming_gn_asan_clang_edge_fuzzer'
'_static_v8_heap_x86_full_symbols_release'), '_static_v8_heap_x86_full_symbols_release'),
'CrWinAsanCov tester': 'none', 'CrWinAsanCov tester': 'none',
'CrWinClang(shared)': 'CrWinClang(shared)':
...@@ -375,10 +375,10 @@ ...@@ -375,10 +375,10 @@
'UBSan Release': 'gn_ubsan_release_bot', 'UBSan Release': 'gn_ubsan_release_bot',
'UBSan vptr Release': 'gn_ubsan_vptr_edge_release_bot', 'UBSan vptr Release': 'gn_ubsan_vptr_edge_release_bot',
'Win ASan Release Coverage': 'Win ASan Release Coverage':
'gyp_asan_edge_fuzzer_v8_heap_release_bot_x86', 'gn_asan_edge_fuzzer_v8_heap_release_bot_x86',
'Win ASan Release Media': 'Win ASan Release Media':
'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86', 'gn_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86',
'Win ASan Release': 'gyp_asan_fuzzer_v8_heap_release_bot_x86', 'Win ASan Release': 'gn_asan_fuzzer_v8_heap_release_bot_x86',
'Win SyzyASAN LKGR': 'gn_syzyasan_no_pch_release_x86', 'Win SyzyASAN LKGR': 'gn_syzyasan_no_pch_release_x86',
}, },
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
'Mac10.9 Tests': 'none', 'Mac10.9 Tests': 'none',
'ios-device': 'ios_gn', 'ios-device': 'ios_gn',
'ios-device-gn': 'ios_gn', 'ios-device-gn': 'ios_gn',
'ios-simulator': 'ios_gyp', 'ios-simulator': 'ios_gn',
'ios-simulator-cronet': 'ios_gn', 'ios-simulator-cronet': 'ios_gn',
'ios-simulator-gn': 'ios_gn', 'ios-simulator-gn': 'ios_gn',
'ios-simulator-swarming': 'ios_gn', 'ios-simulator-swarming': 'ios_gn',
...@@ -419,8 +419,8 @@ ...@@ -419,8 +419,8 @@
'Chromium Linux TSan Builder': 'Chromium Linux TSan Builder':
'swarming_tsan_disable_nacl_gn_release_bot', 'swarming_tsan_disable_nacl_gn_release_bot',
'Chromium Windows Builder (DrMemory x64)': 'Chromium Windows Builder (DrMemory x64)':
'gyp_drmemory_shared_release_x64', 'gn_drmemory_shared_release_x64',
'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86', 'Chromium Windows Builder (DrMemory)': 'gn_drmemory_shared_release_x86',
'Linux ChromeOS MSan Tests': 'none', 'Linux ChromeOS MSan Tests': 'none',
'Linux MSan Tests': 'none', 'Linux MSan Tests': 'none',
'Linux TSan Tests': 'none', 'Linux TSan Tests': 'none',
...@@ -460,8 +460,8 @@ ...@@ -460,8 +460,8 @@
'Chromium Linux TSan Builder': 'Chromium Linux TSan Builder':
'swarming_tsan_disable_nacl_gn_release_bot', 'swarming_tsan_disable_nacl_gn_release_bot',
'Chromium Windows Builder (DrMemory x64)': 'Chromium Windows Builder (DrMemory x64)':
'gyp_drmemory_shared_release_x64', 'gn_drmemory_shared_release_x64',
'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86', 'Chromium Windows Builder (DrMemory)': 'gn_drmemory_shared_release_x86',
'Linux ChromeOS MSan Tests': 'none', 'Linux ChromeOS MSan Tests': 'none',
'Linux MSan Tests': 'none', 'Linux MSan Tests': 'none',
'Linux TSan Tests': 'none', 'Linux TSan Tests': 'none',
...@@ -879,7 +879,7 @@ ...@@ -879,7 +879,7 @@
'tryserver.chromium.mac': { 'tryserver.chromium.mac': {
'ios-device': 'ios_gn', 'ios-device': 'ios_gn',
'ios-device-gn': 'ios_gn', 'ios-device-gn': 'ios_gn',
'ios-simulator': 'ios_gyp', 'ios-simulator': 'ios_gn',
'ios-simulator-cronet': 'ios_gn', 'ios-simulator-cronet': 'ios_gn',
'ios-simulator-gn': 'ios_gn', 'ios-simulator-gn': 'ios_gn',
'ios-simulator-swarming': 'ios_gn', 'ios-simulator-swarming': 'ios_gn',
...@@ -1159,7 +1159,7 @@ ...@@ -1159,7 +1159,7 @@
'closure_compilation': [ 'closure_compilation': [
# The closure bots run their own recipe and shouldn't go through MB. # The closure bots run their own recipe and shouldn't go through MB.
'gyp', 'error', 'error', 'gn',
], ],
'codesearch_gn': [ 'codesearch_gn': [
...@@ -1333,11 +1333,13 @@ ...@@ -1333,11 +1333,13 @@
'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'hybrid', 'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'hybrid',
], ],
'gyp_asan_edge_fuzzer_v8_heap_release_bot_x86': [ 'gn_asan_edge_fuzzer_v8_heap_release_bot_x86': [
'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'x86', 'gn', 'asan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
'x86',
], ],
'gn_asan_disable_nacl_edge_fuzzer_v8_heap_chrome_with_codecs_release_bot': [ ('gn_asan_disable_nacl_edge_fuzzer_'
'v8_heap_chrome_with_codecs_release_bot'): [
'gn', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap', 'gn', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap',
'chrome_with_codecs', 'release_bot', 'chrome_with_codecs', 'release_bot',
], ],
...@@ -1351,13 +1353,13 @@ ...@@ -1351,13 +1353,13 @@
'gn', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'gn', 'asan', 'disable_nacl', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
], ],
'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86': [ 'gn_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86': [
'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 'gn', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 'release_bot',
'release_bot', 'x86', 'x86',
], ],
'gyp_asan_fuzzer_v8_heap_release_bot_x86': [ 'gn_asan_fuzzer_v8_heap_release_bot_x86': [
'gyp', 'asan', 'fuzzer', 'v8_heap', 'release_bot', 'x86', 'gn', 'asan', 'fuzzer', 'v8_heap', 'release_bot', 'x86',
], ],
'gn_asan_lsan_edge_debug_bot': [ 'gn_asan_lsan_edge_debug_bot': [
...@@ -1394,12 +1396,12 @@ ...@@ -1394,12 +1396,12 @@
'gn', 'debug_bot_minimal_symbols', 'x86', 'gn', 'debug_bot_minimal_symbols', 'x86',
], ],
'gyp_drmemory_shared_release_x86': [ 'gn_drmemory_shared_release_x86': [
'gyp', 'drmemory', 'shared', 'release', 'x86', 'gn', 'drmemory', 'shared', 'release', 'x86',
], ],
'gyp_drmemory_shared_release_x64': [ 'gn_drmemory_shared_release_x64': [
'gyp', 'drmemory', 'shared', 'release', 'x64', 'gn', 'drmemory', 'shared', 'release', 'x64',
], ],
'gn_msan_edge_release_bot': [ 'gn_msan_edge_release_bot': [
...@@ -1501,8 +1503,6 @@ ...@@ -1501,8 +1503,6 @@
# build files. # build files.
'ios_gn': [ 'gn', 'error'], 'ios_gn': [ 'gn', 'error'],
'ios_gyp': ['gyp', 'error'],
'mac_views_browser_gn_release_bot': [ 'mac_views_browser_gn_release_bot': [
'mac_views_browser', 'gn', 'release_bot', 'mac_views_browser', 'gn', 'release_bot',
], ],
...@@ -1800,19 +1800,19 @@ ...@@ -1800,19 +1800,19 @@
'swarming', 'gpu_tests', 'gn', 'release_bot', 'swarming', 'gpu_tests', 'gn', 'release_bot',
], ],
('swarming_gyp_asan_clang_edge_fuzzer' ('swarming_gn_asan_clang_edge_fuzzer'
'_static_v8_heap_x86_full_symbols_release'): [ '_static_v8_heap_x86_full_symbols_release'): [
'swarming', 'gyp', 'asan', 'clang_tot', 'edge', 'fuzzer', 'static', 'swarming', 'gn', 'asan', 'clang_tot', 'edge', 'fuzzer', 'static',
'v8_heap', 'full_symbols', 'release', 'v8_heap', 'full_symbols', 'release',
], ],
'swarming_gyp_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release': [ 'swarming_gn_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release': [
'swarming', 'gyp', 'asan', 'clang_tot', 'fuzzer', 'shared', 'v8_heap', 'swarming', 'gn', 'asan', 'clang_tot', 'fuzzer', 'shared', 'v8_heap',
'full_symbols', 'release', 'full_symbols', 'release',
], ],
'swarming_gyp_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release': [ 'swarming_gn_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release': [
'swarming', 'gyp', 'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap', 'swarming', 'gn', 'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap',
'full_symbols', 'release', 'full_symbols', 'release',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment