Enable all Android builders to use 'chrome_with_codecs'.

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).
   'configs': {
     'android_cast_gyp_debug_static_bot': ['android', 'cast', 'gyp', 'debug_static_bot'],
     'android_clang_asan_gyp_debug_bot': ['android', 'clang', 'asan', 'gyp', 'debug_bot'],
-    'android_gn_debug_bot': ['android', 'chrome_with_codecs', 'gn', 'debug_bot'],
-    'android_gn_debug_static_bot': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot'],
-    'android_gn_debug_static_bot_arm64': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'arm64'],
-    'android_gn_debug_static_bot_mipsel': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'mipsel'],
-    'android_gn_debug_static_bot_x64': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'x64'],
-    'android_gn_debug_static_bot_x86': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'x86'],
+    'android_gn_debug_bot': ['android', 'gn', 'debug_bot'],
+    'android_gn_debug_static_bot': ['android', 'gn', 'debug_static_bot'],
+    'android_gn_debug_static_bot_arm64': ['android', 'gn', 'debug_static_bot', 'arm64'],
+    'android_gn_debug_static_bot_mipsel': ['android', 'gn', 'debug_static_bot', 'mipsel'],
+    'android_gn_debug_static_bot_x64': ['android', 'gn', 'debug_static_bot', 'x64'],
+    'android_gn_debug_static_bot_x86': ['android', 'gn', 'debug_static_bot', 'x86'],
     'android_gn_release_bot': ['android', 'gn', 'release_bot'],
     'android_gn_release_trybot': ['android', 'gn', 'release_trybot'],
     'android_gyp_debug_static_bot': ['android', 'gyp', 'debug_static_bot'],
     'android_gyp_debug_static_bot_arm64': ['android', 'gyp', 'debug_static_bot', 'arm64'],
     'android_gyp_release_bot': ['android', 'gyp', 'release_bot'],
-    'android_gyp_release_bot_minimal_symbols': ['android', 'gyp', 'release_bot_minimal_symbols'],
     'cast_gn_release_bot': ['cast', 'gn', 'release_bot'],
     'cast_gn_release_trybot': ['cast', 'gn', 'release_trybot'],
     'chromeos_gn_debug_bot': ['chromeos', 'gn', 'debug_bot'],
     'chromeos_ozone_gn_release_bot': ['chromeos', 'ozone', 'gn', 'release_bot'],
     'chromeos_ozone_gn_release_trybot': ['chromeos', 'ozone', 'gn', 'release_trybot'],
     'dev_gn_debug': ['gn', 'debug', 'shared', 'full_symbols'],
     'dev_gn_release': ['gn', 'release', 'shared'],
     'dev_gyp_debug': ['gyp', 'debug', 'shared', 'full_symbols'],
     'dev_gyp_release': ['gyp', 'release', 'shared'],
     'embedded_gyp_debug_bot': ['embedded', 'gyp', 'debug_bot'],
 
+    # Explicitly use 'android_without_codecs' here since this bot is responsible
+    # for building publicly advertised non-Official Android builds which are not
+    # allowed to have proprietary codecs enabled.
+    'android_gyp_release_bot_minimal_symbols': ['android_without_codecs', 'gyp', 'release_bot_minimal_symbols'],

[Dirk Pranke, 2016/03/09 02:26:53]

I would actually change this name to
'android_without_codecs_gyp_release_bot_minimal_symbols' to be crystal-clear,
even if it is exceptionally verbose (the upside is that it at least follows the
normal config convention names). 

I would then make sure the comments for the 'android' mixin and the 'chromium'
waterfall are clear as to what they're doing, and omit the comment here.

[DaleCurtis, 2016/03/09 04:19:58]

Done.

+
     # This is the "deployment" config for the blimp builds. Currently
     # we want them to be debug, non-optimized builds (and we don't need any
     # chrome branding), so we don't use the "official" mixin.
     'gn_blimp_debug': ['gn', 'blimp', 'debug'],
 
     'gn_cfi_release_bot': ['gn', 'cfi', 'release_bot'],
     'gn_cfi_release_trybot': ['gn', 'cfi', 'release_trybot'],
     'gn_cfi_diag_release_bot': ['gn', 'cfi', 'cfi_diag', 'release_bot'],
     'gn_debug_bot': ['gn', 'debug_bot'],
     'gn_debug_bot_minimal_symbols': ['gn', 'debug_bot_minimal_symbols'],
@@ skipping 12 matching lines @@
     'gn_release_trybot_x86': ['gn', 'release_trybot', 'x86'],
     'gyp_debug_bot': ['gyp', 'debug_bot'],
     'gyp_debug_bot_x86': ['gyp', 'debug_bot', 'x86'],
     'gyp_official_goma': ['gyp', 'official', 'goma'],
     'gyp_official_goma_chromeos': ['gyp', 'official', 'goma', 'chromeos'],
     'gyp_official_goma_x86': ['gyp', 'official', 'goma', 'x86'],
     'gyp_official_goma_minimal_symbols_android': ['gyp', 'official', 'goma', 'minimal_symbols', 'android'],
     'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'],
     'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'],
     'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'],
-    'gyp_release_bot_android': ['gyp', 'release_bot', 'android'],
+    'gyp_release_bot_android': ['gyp', 'release_bot', 'android', 'chrome_with_codecs'],

[Dirk Pranke, 2016/03/09 02:26:53]

This change isn't needed, right?

[DaleCurtis, 2016/03/09 04:19:57]

Correct, stale change. Removed.

     'gyp_release_trybot': ['gyp', 'release_trybot'],
     'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'],
     'gn_release_libfuzzer_asan': ['gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa'],
     'gn_release_libfuzzer_msan': ['gn', 'release', 'libfuzzer', 'msan', 'proprietary_codecs', 'pdf_xfa'],
     'gn_release_drmemory_drfuzz_x86': ['gn', 'release', 'drmemory', 'drfuzz', 'x86', 'proprietary_codecs'],
     'gn_release_drmemory_drfuzz': ['gn', 'release', 'drmemory', 'drfuzz', 'proprietary_codecs'],
     'gyp_valgrind_release_bot': ['gyp', 'valgrind', 'release_bot'],
     'gyp_valgrind_debug_bot': ['gyp', 'valgrind', 'debug_bot'],
     'gyp_valgrind_chromeos_release_bot': ['gyp', 'chromeos', 'valgrind', 'release_bot'],
     'gyp_drmemory_shared_release_x86': ['gyp', 'drmemory', 'shared', 'release', 'x86'],
     'gyp_drmemory_shared_release_x64': ['gyp', 'drmemory', 'shared', 'release', 'x64'],
 
     # This is just for completeness; any bot that uses this config
     # should never actually run MB.
     'none': ['none'],
 
     'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'],
     'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'],
     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
     'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'],
 
-    'swarming_android_gn_release_bot_minimal_symbols': ['swarming', 'android', 'chrome_with_codecs', 'gn', 'release_bot_minimal_symbols'],
+    'swarming_android_gn_release_bot_minimal_symbols': ['swarming', 'android', 'gn', 'release_bot_minimal_symbols'],
     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'release_trybot'],
     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 'release_trybot'],
     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp', 'release_bot'],
     'swarming_gpu_fyi_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn', 'debug_bot', 'angle_deqp_tests'],
     'swarming_gpu_fyi_tests_gn_debug_trybot': ['swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn', 'debug_trybot', 'angle_deqp_tests'],
     'swarming_gpu_fyi_tests_gn_release_bot': ['swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn', 'release_bot', 'angle_deqp_tests'],
     'swarming_gpu_fyi_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn', 'release_trybot', 'angle_deqp_tests'],
     'swarming_gpu_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'gn', 'debug_bot'],
     'swarming_gpu_tests_gn_release_bot': ['swarming', 'gpu_tests', 'gn', 'release_bot'],
     'swarming_gpu_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'gn', 'release_trybot'],
@@ skipping 28 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_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'],
 
     # Configurations that build with proprietary codecs enabled.
-    'android_gn_release_bot_chrome_with_codecs': ['android', 'gn', 'release_bot', 'chrome_with_codecs'],
     'gn_debug_bot_minimal_symbols_chrome_with_codecs': ['gn', 'debug_bot_minimal_symbols', 'chrome_with_codecs'],
     'gn_debug_static_bot_chrome_with_codecs': ['gn', 'debug_static_bot', 'chrome_with_codecs'],
     'gn_release_bot_chrome_with_codecs': ['gn', 'release_bot', 'chrome_with_codecs'],
     'gn_release_bot_minimal_symbols_chrome_with_codecs': ['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'],
@@ skipping 23 matching lines @@
   # contact to be on the hook for fixing the config.
   'unsupported_configs': [
   ],
 
   # 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',
+      'mixins': ['chrome_with_codecs'],

[Dirk Pranke, 2016/03/09 02:26:53]

Can we change this to:

  'android': {
    'mixins': ['android_without_codecs', 'chrome_with_codecs'],
  }

I think this is stylistically a bit clearer and cleaner.

Also, add a comment as to why we build w/ codecs by default on most bots but not
on the p/chromium bots ?

[DaleCurtis, 2016/03/09 04:19:57]

Good suggestion. Done.

+    },
+
+    'android_without_codecs': {
+      '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',
     },
 
     'angle_deqp_tests': {
       'gn_args': 'build_angle_deqp_tests=true',
     },
@@ skipping 281 matching lines @@
   # page on the buildbots, *not* alphabetically.
   #
   # TODO(crbug.com/481692): Add in remaining bots on the waterfalls.
   'masters': {
     'chrome': {
       'precise64': 'gn_official',
     },
     'chrome.continuous': {
       'precise64 trunk': 'gn_official',
     },
+    # Take care when changing any of these builders to ensure that you do not

[DaleCurtis, 2016/03/07 22:36:04]

I'm not a fan of this of enforcement by comment, so if there's a way to check
this at submit time through either a PRESUBMIT or some test please let me know
:)

[Dirk Pranke, 2016/03/09 02:26:53]

I agree that we should probably enforce this more strictly. the presubmit checks
run `mb validate`,
so we can change mb validate to check that no bot on the chromium waterfall
contains the chrome_with_codecs
defines.

[DaleCurtis, 2016/03/09 04:19:58]

Done. Added a unittest for that too.

+    # include a configuration with 'chrome_with_codecs' since these builders
+    # generated publicly advertised non-Official builds which are not allowed to
+    # have proprietary codecs enabled.
     'chromium': {
       'Win': 'noswarming_gyp_release_bot',
       'Mac': 'noswarming_gyp_release_bot_mac_strip',
       'Linux x64': 'noswarming_gn_release_bot',
       'Linux': 'noswarming_gyp_release_bot_x86',
       'Android': 'android_gyp_release_bot_minimal_symbols',
     },
     'chromium.android': {
       'Android GN Builder (dbg)': 'android_gn_debug_bot',
       'Android MIPS Builder (dbg)': 'android_gn_debug_static_bot_mipsel',
@@ skipping 170 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_chrome_with_codecs',
+      'Android GN': 'android_gn_release_bot',
       'Android GN (dbg)': 'android_gn_debug_bot',
       'Linux Builder': 'gn_release_bot_chrome_with_codecs',
       'Mac GN': 'gn_release_bot_chrome_with_codecs',
       'Mac GN (dbg)': 'gn_debug_static_bot_chrome_with_codecs',
       'Win x64 GN': 'gn_release_bot_minimal_symbols_chrome_with_codecs',
       'Win x64 GN (dbg)': 'gn_debug_bot_minimal_symbols_chrome_with_codecs',
     },
     'client.skia': {
       'Linux Builder': 'swarming_gn_release_bot',
       'Linux Builder-Trybot': 'swarming_gn_release_bot',
@@ skipping 133 matching lines @@
       'win_chromium_clang_upload': 'gn_release_bot',
       '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',
     },
   },
 }