Version 2.11.0-200.0.dev
Merge commit 'ae7ff6c13ac7371ee376f8683c97333b6b88b8f8' into 'dev'
diff --git a/tools/VERSION b/tools/VERSION
index a308234..0fd19c8 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 11
PATCH 0
-PRERELEASE 199
+PRERELEASE 200
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 1115d5e..6f1f168 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -2698,10 +2698,12 @@
},
{
"builders": [
- "analyzer-nnbd-linux-release"
+ "analyzer-nnbd-linux-release",
+ "analyzer-nnbd-mac-release",
+ "analyzer-nnbd-win-release"
],
"meta": {
- "description": "This configuration is used by the nnbd analyzer builder."
+ "description": "This configuration is used by the nnbd analyzer builders."
},
"steps": [
{
diff --git a/tools/gn.py b/tools/gn.py
index fbd3a2f..11bf8a4 100755
--- a/tools/gn.py
+++ b/tools/gn.py
@@ -265,6 +265,9 @@
gn_args['use_goma'] = False
gn_args['goma_dir'] = None
+ if gn_args['target_os'] == 'mac' and gn_args['use_goma']:
+ gn_args['mac_use_goma_rbe'] = True
+
# Code coverage requires -O0 to be set.
if enable_code_coverage:
gn_args['dart_debug_optimization_level'] = 0
