Flip Mac CQ bots and matching waterfall bots to GN.
This affects:
tryserver.chromium.mac:
- mac_chromium_compile_dbg_ng
- mac_chromium_compile_rel_ng
- mac_chromium_dbg_ng
- mac_chromium_rel_ng
chromium.mac:
- Mac Builder
- Mac Builder (dbg)
chromium.gpu:
- GPU Mac Builder
- GPU Mac Builder (dbg)
chromium.gpu.fyi
- GPU Mac Builder
- GPU Mac Builder (dbg)
patch from issue 2046863005 at patchset 60001 (http://crrev.com/2046863005#ps60001)
R=dpranke@chromium.org
BUG=618468
Review-Url: https://codereview.chromium.org/2085483003
Cr-Commit-Position: refs/heads/master@{#400895}
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 0677e26..fed867a 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -227,8 +227,8 @@
'chromium.gpu': {
# These all use the 'trybot' mixins to ensure that dcheck is on.
- 'GPU Mac Builder': 'swarming_gpu_tests_gyp_release_trybot',
- 'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot',
+ 'GPU Mac Builder': 'swarming_gpu_tests_gn_release_trybot',
+ 'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
'GPU Linux Builder': 'swarming_gpu_tests_gn_release_trybot',
'GPU Win Builder': 'swarming_gpu_tests_gn_release_trybot_x86',
@@ -253,8 +253,8 @@
'Android Release (Nexus 9)': 'android_gn_release_trybot_arm64',
'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
- 'GPU Mac Builder': 'swarming_gpu_fyi_tests_gyp_release_trybot',
- 'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
+ 'GPU Mac Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
+ 'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
'GPU Win Builder (dbg)':
'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
@@ -799,13 +799,13 @@
'mac_chromium_archive_rel_ng': 'noswarming_gyp_release_trybot',
'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
'mac_chromium_asan_variable': 'findit',
- 'mac_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot',
- 'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
- 'mac_chromium_dbg_ng': 'swarming_gyp_debug_trybot',
+ 'mac_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
+ 'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
+ 'mac_chromium_dbg_ng': 'swarming_gn_debug_trybot',
'mac_chromium_gn_dbg': 'gn_debug_bot',
'mac_chromium_gn_rel': 'gn_release_trybot',
'mac_chromium_gn_upload': 'gn_release_bot',
- 'mac_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
+ 'mac_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
'mac_chromium_variable': 'findit',
'mac_chromium_variable_10.10': 'findit',
'mac_chromium_variable_10.10_layout': 'findit',
@@ -1680,10 +1680,6 @@
'swarming', 'gpu_tests', 'gn', 'release_trybot', 'x86',
],
- 'swarming_gpu_tests_gyp_debug_trybot': [
- 'swarming', 'gpu_tests', 'gyp', 'debug_trybot',
- ],
-
'swarming_gpu_tests_gyp_release_bot': [
'swarming', 'gpu_tests', 'gyp', 'release_bot',
],
@@ -1838,10 +1834,6 @@
'swarming', 'gyp', 'debug_bot',
],
- 'swarming_gyp_debug_trybot': [
- 'swarming', 'gyp', 'debug_trybot',
- ],
-
'swarming_gn_release_trybot_arm': [
'swarming', 'gn', 'release_trybot', 'arm', 'crosscompile',
],
diff --git a/tools/perf/chrome_telemetry_build/BUILD.gn b/tools/perf/chrome_telemetry_build/BUILD.gn
index e5dec3e7..74d4624 100644
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -41,11 +41,11 @@
data = [
"//tools/perf/chrome_telemetry_build/",
"//third_party/catapult/",
+ "//components/crash/content/tools/generate_breakpad_symbols.py",
]
if (is_win) {
data_deps += [ "//chrome:reorder_imports" ]
- data += [ "//components/crash/content/tools/generate_breakpad_symbols.py" ]
}
if (is_linux) {
@@ -53,7 +53,15 @@
"//tools/xdisplaycheck",
"//breakpad:dump_syms($host_toolchain)",
]
- data += [ "//components/crash/content/tools/generate_breakpad_symbols.py" ]
+ }
+
+ if (is_mac) {
+ data_deps += [
+ "//breakpad:dump_syms",
+ "//chrome:chrome_framework",
+ "//chrome:chrome_helper_app",
+ "//third_party/crashpad/crashpad/tools:crashpad_database_util",
+ ]
}
if (is_win && (symbol_level == 1 || symbol_level == 2)) {
