Fix libfuzzer configurations to actually use proprietary 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 a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     'chromeos.chrome': {
@@ skipping 223 matching lines @@
         'gn_chromeos_with_codecs_debug_bot',
       'MD Top Chrome Win material':
         'gn_debug_bot_minimal_symbols_x64',
       'MD Top Chrome Linux material': 'gn_debug_bot',
       'LTO Linux': 'gn_official_goma_lto',
       'LTO Linux Perf': 'gn_official_goma_lto',
       'Libfuzzer Upload Linux ASan': 'gn_release_libfuzzer_asan',
       'Libfuzzer Upload Linux ASan Debug': 'gn_debug_libfuzzer_asan',
       'Libfuzzer Upload Linux MSan': 'gn_release_libfuzzer_msan',
       'Libfuzzer Upload Linux UBSan': 'gn_release_libfuzzer_ubsan',
-      'Libfuzzer Upload Mac ASan': 'gn_release_libfuzzer_asan',
+      'Libfuzzer Upload Mac ASan': 'gn_release_libfuzzer_mac_asan',
       'Linux ARM': 'swarming_gn_release_bot_arm',
       'Linux deterministic': 'gn_release_bot',
       'Linux remote_run Builder': 'swarming_gn_release_bot',
       'Linux remote_run Tester': 'swarming_gn_release_bot',
       'Linux V8 API Stability': 'gn_release_bot',
       'Mac deterministic': 'gn_release_bot_mac_strip',
       'Mojo ChromiumOS': 'swarming_chromeos_gn_release_bot',
       'Mojo Windows': 'gn_release_bot_minimal_symbols_x86',
       'Site Isolation Linux': 'gn_release_trybot',
       'Site Isolation Win': 'gn_release_trybot_x86',
@@ skipping 967 matching lines @@
 
     'gn_debug_bot': [
       'gn', 'debug_bot',
     ],
 
     'gn_debug_bot_minimal_symbols_x86': [
       'gn', 'debug_bot_minimal_symbols', 'x86',
     ],
 
     'gn_debug_libfuzzer_asan': [
-      'gn', 'debug', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa',
+      'gn', 'debug', 'libfuzzer', 'asan', 'chromeos_with_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
 
     'gn_linux_upload': [
       'gn_linux_upload', 'official', 'goma',
     ],
 
     'gn_official': [
       'gn', 'official',
     ],
@@ skipping 52 matching lines @@
 
     'gn_release_bot_minimal_symbols_x86': [
       'gn', 'release_bot_minimal_symbols', 'x86',
     ],
 
     'gn_release_bot_x86': [
       'gn', 'release_bot', 'x86',
     ],
 
     'gn_release_drmemory_drfuzz': [
-      'gn', 'release', 'drmemory', 'drfuzz', 'proprietary_codecs',
+      'gn', 'release', 'drmemory', 'drfuzz', 'chrome_with_codecs',
     ],
 
     'gn_release_drmemory_drfuzz_x86': [
-      'gn', 'release', 'drmemory', 'drfuzz', 'x86', 'proprietary_codecs',
+      'gn', 'release', 'drmemory', 'drfuzz', 'x86', 'chrome_with_codecs',
      ],
 
     'gn_release_afl_asan': [
-      'gn', 'release', 'afl', 'asan', 'proprietary_codecs', 'pdf_xfa',
+      'gn', 'release', 'afl', 'asan', 'chromeos_with_codecs', 'pdf_xfa',
+      'disable_nacl',
+    ],
+
+    'gn_release_libfuzzer_mac_asan': [
+      'gn', 'release', 'libfuzzer', 'asan', 'chrome_with_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
 
     'gn_release_libfuzzer_asan': [
-      'gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa',
-      'disable_nacl',
-    ],
-
-    'gn_release_libfuzzer_asan': [
-      'gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs', 'pdf_xfa',
+      'gn', 'release', 'libfuzzer', 'asan', 'chromeos_with_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
 
     'gn_release_libfuzzer_msan': [
-      'gn', 'release', 'libfuzzer', 'msan', 'proprietary_codecs', 'pdf_xfa',
+      'gn', 'release', 'libfuzzer', 'msan', 'chromeos_with_codecs', 'pdf_xfa',
       'disable_nacl',
     ],
     'gn_release_libfuzzer_ubsan': [
-      'gn', 'release', 'libfuzzer', 'ubsan_security', 'proprietary_codecs',
+      'gn', 'release', 'libfuzzer', 'ubsan_security', 'chromeos_with_codecs',
       'pdf_xfa', 'disable_nacl',
     ],
 
     'gn_release_trybot': [
       'gn', 'release_trybot',
     ],
 
     'gn_release_trybot_x64': [
       'gn', 'release_trybot', 'x64',
     ],
@@ skipping 1004 matching lines @@
     'ozone': {
       'gn_args': 'use_ozone=true',
       'gyp_defines': 'use_ozone=1',
     },
 
     'pdf_xfa': {
       'gn_args': 'pdf_enable_xfa=true',
       'gyp_defines': 'pdf_enable_xfa=1',
     },
 
+    # Note: This is probably not what you want to use. Instead use one of the
+    # chrome_with_codecs or chromeos_with_codecs mixins.

[Dirk Pranke, 2016/08/19 20:18:35]

arguably this shouldn't be a separate mixin at all, to avoid this potential
confusion (it got refactored into a separate one a while ago, but I think that
led to this mistake).

But, I wouldn't fix this at the moment, this whole file is due for some
reworking now that we can drop GYP.

     'proprietary_codecs': {
       'gn_args': 'proprietary_codecs=true',
       'gyp_defines': 'proprietary_codecs=1',
     },
 
     'release': {
       'gn_args': 'is_debug=false',
     },
 
     'release_bot': {
@@ skipping 97 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }