MB: Build proprietary codecs for WebRTC Chromium GN bots.

tools/mb/mb_config.pyl

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This is the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
@@ skipping 116 matching lines @@
     'swarming_gyp_release_bot_arm': ['swarming', 'gyp', 'release_bot', 'arm', 'crosscompile'],
     'swarming_gyp_release_bot_minimal_symbols_x64': ['swarming', 'gyp', 'release_bot_minimal_symbols', 'x64'],
     'swarming_gyp_release_bot_minimal_symbols_x86': ['swarming', 'gyp', 'release_bot_minimal_symbols', 'x86'],
     'swarming_gyp_release_bot_x64': ['swarming', 'gyp', 'release_bot', 'x64'],
     'swarming_gyp_release_bot_x86': ['swarming', 'gyp', 'release_bot', 'x86'],
     'swarming_gyp_release_trybot_arm': ['swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile'],
     'swarming_gyp_release_trybot_minimal_symbols_x64': ['swarming', 'gyp', 'release_trybot', 'minimal_symbols', 'x64'],
     '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
     # added the entries yet.
     # 'tbd': ['none'],
 
     # clang/win doesn't work with goma yet, so this can't use debug_bot:
     'win_clang_debug_bot': ['gn', 'clang', 'debug', 'shared', 'minimal_symbols'],
   },
 
@@ skipping 21 matching lines @@
   ],
 
   # This is a dict mapping a given 'mixin' name to a dict of settings that
   # mb should use. See //tools/mb/docs/user_guide.md for more information.
   'mixins': {
     'android': {
       'gn_args': 'target_os="android"',
       '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',
     },
 
     'arm64': {
       'gn_args': 'target_cpu="arm64"',
       'gyp_defines': 'target_arch=arm64',
     },
 
@@ skipping 10 matching lines @@
     'cast': {
       'gn_args': 'is_chromecast=true',
       'gyp_defines': 'chromecast=1',
     },
 
     'cfi': {
       'gn_args': 'is_cfi=true',
       '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',
     },
 
     'clang': {
       'gn_args': 'is_clang=true',
       'gyp_defines': 'clang=1',
     },
 
@@ skipping 63 matching lines @@
     'gn': {'type': 'gn'},
 
     'goma': {
       # 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 goma_dir="$(goma_dir)"',
       'gyp_defines': 'use_goma=1 gomadir=$(goma_dir)',
     },
 
     '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'},
 
     'internal_gles2_conform_tests': {
       'gn_args': 'internal_gles2_conform_tests=true',
       'gyp_defines': 'internal_gles2_conform_tests=1',
     },
 
     'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },
@@ skipping 287 matching lines @@
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_bot',
       'Linux Release (NVIDIA)': 'none',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Release (Intel)': 'none',
       'Linux Release (Intel Graphics Stack)': 'none',
       'Linux Release (ATI)': 'none',
       'Linux Debug (NVIDIA)': 'none',
       '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',
       'Linux Builder-Trybot': 'swarming_gn_release_bot',
       'Linux Tests': 'swarming_gn_release_bot',
     },
     'client.v8.fyi': {
       'Linux Debug Builder': 'gn_debug_bot',
       'V8 Linux GN': 'gn_release_bot',
       'V8 Android GN (dbg)': 'android_gn_debug_bot',
@@ skipping 111 matching lines @@
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
     },
   },
 }