From fd3b97c5d253e2ea40e88be087b37d1722134fa8 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 23 Jul 2021 16:26:28 +0200 Subject: [PATCH] Ensure release bots run with dchecks off. Follow-up of https://webrtc-review.googlesource.com/c/src/+/226563, inspired by V8's crrev.com/c/3048180. Bug: chromium:1225701, webrtc:12988 Change-Id: I0e2ab4fe72941d764fddab87b730645c62ae968d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226864 Reviewed-by: Andrey Logvin Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#34542} --- tools_webrtc/mb/mb_config.pyl | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 74678f875e..c3c593e75d 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -459,8 +459,12 @@ 'gn_args': 'is_clang=true', }, + # This mixin also sets 'dcheck_always_on=true' to ensure Chromium's + # GN files (e.g. things in //build, etc..) agree with the value of + # 'rtc_dcheck_always_on' when they read 'dcheck_always_on'. + # See crbug.com/1231890#c9 for more info. 'rtc_dcheck_always_on': { - 'gn_args': 'rtc_dcheck_always_on=true', + 'gn_args': 'rtc_dcheck_always_on=true dcheck_always_on=true', }, 'debug': { @@ -539,14 +543,17 @@ 'gn_args': 'optimize_for_fuzzing=true', }, + 'release': { + 'gn_args': 'is_debug=false dcheck_always_on=false', + }, + + # The 'pure_release_bot' configuration is for release bots that are doing a + # 100% release build without DCHECKs while 'release_bot' is a partial + # release configs since both `rtc_dcheck_always_on` and `dcheck_always_on` + # are set to true. 'pure_release_bot': { 'mixins': ['release', 'goma'], }, - - 'release': { - 'gn_args': 'is_debug=false', - }, - 'release_bot': { 'mixins': ['pure_release_bot', 'rtc_dcheck_always_on'], },