Index: webrtc/build/mb_config.pyl |
diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl |
index 8271a4792c3e7fffd011d6eec67aef0cc9f5af51..49050aaffc9dbc8170cff9c78645e869eee2532a 100644 |
--- a/webrtc/build/mb_config.pyl |
+++ b/webrtc/build/mb_config.pyl |
@@ -48,7 +48,9 @@ |
'Linux MSan': 'gyp_msan_clang_release_bot_x64', |
'Linux Tsan v2': 'gyp_tsan_clang_release_bot_x64', |
'Linux UBSan': 'gyp_ubsan_clang_release_bot_x64', |
+ 'Linux UBSan (GN)': 'gn_ubsan_clang_release_bot_x64', |
kjellander_webrtc
2016/08/17 12:19:22
This won't change anything if you run this at tryj
ehmaldonado_webrtc
2016/08/17 12:37:05
Oh, I only meant to use mb locally to generate bot
|
'Linux UBSan vptr': 'gyp_ubsan_vptr_clang_release_bot_x64', |
+ 'Linux UBSan vptr (GN)': 'gn_ubsan_vptr_clang_release_bot_x64', |
'Linux64 Release [large tests]': 'gyp_release_bot_x64', |
'Linux64 Debug (GN)': 'gn_debug_bot_x64', |
'Linux64 Release (GN)': 'gn_release_bot_x64', |
@@ -229,9 +231,15 @@ |
'gyp_ubsan_clang_release_bot_x64': [ |
'gyp', 'ubsan', 'clang', 'openh264_release_bot', 'x64' |
], |
+ 'gn_ubsan_clang_release_bot_x64': [ |
+ 'gn', 'ubsan', 'clang', 'openh264_release_bot', 'x64' |
+ ], |
'gyp_ubsan_vptr_clang_release_bot_x64': [ |
'gyp', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64' |
], |
+ 'gn_ubsan_vptr_clang_release_bot_x64': [ |
+ 'gn', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64' |
+ ], |
'gn_debug_bot_x64': [ |
'gn', 'openh264_debug_bot', 'x64' |
], |
@@ -357,11 +365,11 @@ |
}, |
'debug_bot': { |
- 'mixins': ['debug', 'shared', 'goma'], |
+ 'mixins': ['debug', 'shared'], |
}, |
'debug_static_bot': { |
- 'mixins': ['debug', 'static', 'minimal_symbols', 'goma'], |
+ 'mixins': ['debug', 'static', 'minimal_symbols'], |
}, |
'device': { |
@@ -385,13 +393,6 @@ |
'gn': {'type': 'gn'}, |
- 'goma': { |
kjellander_webrtc
2016/08/17 12:19:22
Does Goma change the result or why did you remove
ehmaldonado_webrtc
2016/08/17 12:37:05
I don't have goma locally.
kjellander_webrtc
2016/08/19 07:56:23
You should, to speed up compilation. Check out go/
ehmaldonado_webrtc
2016/08/19 08:16:06
Ok, I'll take a look, thanks :)
|
- # The MB code will properly escape goma_dir if necessary in the GYP |
- # code path; the GN code path needs no escaping. |
- 'gn_args': 'use_goma=true', |
- 'gyp_defines': 'use_goma=1', |
- }, |
- |
'gyp': {'type': 'gyp'}, |
'ios': { |
@@ -456,7 +457,7 @@ |
}, |
'release_bot': { |
- 'mixins': ['release', 'static', 'dcheck_always_on', 'goma'], |
+ 'mixins': ['release', 'static', 'dcheck_always_on'], |
}, |
'shared': { |