MB: Build proprietary codecs for WebRTC Chromium GN bots.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index ceed0825c8d81f8d7b2ab8f0db005dcde82d0c70..c1315d9aa66f738a385b6912a1bdf33d509a89a0 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -134,6 +134,16 @@
     'swarming_gyp_release_trybot_minimal_symbols_x86': ['swarming', 'gyp', 'release_trybot', 'minimal_symbols', 'x86'],
     'swarming_tsan_gyp_release_trybot': ['swarming', 'disable_nacl', 'tsan', 'gyp', 'release_trybot'],
 
+    # WebRTC Chromium bots that build with proprietary codecs enabled. These

[kjellander_chromium, 2016/02/02 13:30:38]

There's a bit of duplication here compared with the existing configs. Should I
create individual mixins for each of them to eliminate duplication at the cost
of added verbosity?

I just want to make sure they're kept in sync.

+    # configs should be kept in sync with the counterparts without the "webrtc_"
+    # prefix.
+    'webrtc_android_gn_debug_bot': ['android', 'gn', 'debug_bot', 'chrome_with_codecs'],

[Dirk Pranke, 2016/02/02 22:07:48]

I would name this 'android_gn_debug_bot_chrome_with_codecs' (basically joining
the mixins together w/ '_').

There's nothing specific about webrtc in these defs, so I wouldn't use that in
the name.

Same for the rest.

[kjellander_chromium, 2016/02/04 12:23:09]

Done.

+    'webrtc_android_gn_release_bot': ['android', 'gn', 'release_bot', 'chrome_with_codecs'],
+    'webrtc_gn_debug_bot_minimal_symbols': ['gn', 'debug_bot_minimal_symbols', 'chrome_with_codecs'],
+    'webrtc_gn_debug_static_bot': ['gn', 'debug_static_bot', 'chrome_with_codecs'],
+    'webrtc_gn_release_bot': ['gn', 'release_bot', 'chrome_with_codecs'],
+    'webrtc_gn_release_bot_minimal_symbols': ['gn', 'release_bot_minimal_symbols', 'chrome_with_codecs'],
+
     # This indicates that we haven't yet set up this bot w/ MB. This is
     # different from 'none' in that a bot set to 'none' should never do
     # compiles; a bot set to 'tbd' should do compiles but we haven't
@@ -175,6 +185,11 @@
       'gyp_defines': 'OS=android',
     },
 
+    'archive_gpu_tests': {
+      # archive_gpu_tests=true is not needed in GN builds.
+      'gyp_defines': 'archive_gpu_tests=1',
+    },
+
     'arm': {
       'gn_args': 'target_cpu="arm"',
       'gyp_defines': 'target_arch=arm',
@@ -205,6 +220,11 @@
       'gyp_defines': 'cfi_vptr=1',
     },
 
+    'chrome_with_codecs': {
+      'gn_args': 'ffmpeg_branding="Chrome" proprietary_codecs=true',
+      'gyp_defines': 'ffmpeg_branding=Chrome proprietary_codecs=1',
+    },
+
     'chromeos': {
       'gn_args': 'target_os="chromeos"',
       'gyp_defines': 'chromeos=1',
@@ -288,9 +308,7 @@
     },
 
     'gpu_tests': {
-      # archive_gpu_tests=true is not needed in GN builds.
-      'gn_args': 'ffmpeg_branding="Chrome" proprietary_codecs=true',
-      'gyp_defines': 'archive_gpu_tests=1 ffmpeg_branding=Chrome proprietary_codecs=1',
+      'mixins': ['archive_gpu_tests', 'chrome_with_codecs'],

[kjellander_chromium, 2016/02/02 13:30:38]

I assume this is how it worked. I don't indent to change anything for the users
of the gpu_tests, but I wanted to avoid duplicating these settings.

If so - nice framework you built here Dirk!

[Dirk Pranke, 2016/02/02 22:07:48]

Yup, that's how this works.

     },
 
     'gyp': {'type': 'gyp'},
@@ -598,13 +616,13 @@
       'Linux Release dEQP (NVIDIA)': 'none',
     },
     'chromium.webrtc.fyi': {
-      'Android GN': 'android_gn_release_bot',
-      'Android GN (dbg)': 'android_gn_debug_bot',
-      'Linux Builder': 'gn_release_bot',
-      'Mac GN': 'gn_release_bot',
-      'Mac GN (dbg)': 'gn_debug_static_bot',
-      'Win x64 GN': 'gn_release_bot_minimal_symbols',
-      'Win x64 GN (dbg)': 'gn_debug_bot_minimal_symbols',
+      'Android GN': 'webrtc_android_gn_release_bot',
+      'Android GN (dbg)': 'webrtc_android_gn_debug_bot',
+      'Linux Builder': 'webrtc_gn_release_bot',
+      'Mac GN': 'webrtc_gn_release_bot',
+      'Mac GN (dbg)': 'webrtc_gn_debug_static_bot',
+      'Win x64 GN': 'webrtc_gn_release_bot_minimal_symbols',
+      'Win x64 GN (dbg)': 'webrtc_gn_debug_bot_minimal_symbols',
     },
     'client.skia': {
       'Linux Builder': 'swarming_gn_release_bot',