From 2f25ade901cc9b787938f7c68f46e52e180cfce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20H=C3=B6glund?= <phoglund@webrtc.org>
Date: Thu, 29 Nov 2018 13:31:23 +0100
Subject: [PATCH] Disable goma for uwp bots.

Goma dislikes the compiler options passed in the UWP build.

Bug: webrtc:10050
Change-Id: Iea356c628daae716d500fd01a2824cb686e384fa
Reviewed-on: https://webrtc-review.googlesource.com/c/112288
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25837}
---
 tools_webrtc/mb/mb_config.pyl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 7c536df6ee..d045dc4345 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -351,7 +351,8 @@
       'win_fastlink',
     ],
     'win_uwp_release_bot_x64': [
-      'gn', 'clang', 'openh264', 'release_bot', 'x64', 'winuwp',
+      # UWP passes compiler flags that are not supported by goma.
+      'gn', 'clang', 'openh264', 'x64', 'winuwp', 'release_bot_no_goma'
     ],
 
     # Mac
@@ -548,6 +549,10 @@
       'mixins': ['pure_release_bot', 'dcheck_always_on'],
     },
 
+    'release_bot_no_goma': {
+      'mixins': ['release', 'dcheck_always_on'],
+    },
+
     'tsan': {
       'gn_args': 'is_tsan=true',
     },