More MB fixes in preparation for flipping Linux bots to use MB.

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 140 matching lines @@
       # GN binary; ideally we could just turn glib off, but that doesn't
       # actually work, so we need to pretend to be doing an ozone build
       # in order for the flag to actually take effect.
       'gn_args': 'use_ozone=true use_glib=false',
     },
 
     'gn': {'type': 'gn'},
 
     'goma': {
       'gn_args': 'use_goma=true goma_dir="$(goma_dir)"',
-      'gyp_defines': 'goma=1 gomadir=$(goma_dir)',
+      'gyp_defines': 'use_goma=1 gomadir=$(goma_dir)',
     },
 
     'gpu_tests': {
       'gn_args': 'archive_gpu_tests=true',
       'gyp_defines': 'archive_gpu_tests=1',
     },
 
     'gyp': {'type': 'gyp'},
 
     'minimal_symbols': {
@@ skipping 119 matching lines @@
       'V8 Linux GN': 'gn_release_bot',
       'V8 Android GN (dbg)': 'android_gn_debug_bot',
     },
     'tryserver.blink': {
       'android_blink_compile_dbg': 'android_gyp_debug_bot',
       'android_blink_compile_rel': 'android_gyp_release_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_bot',
       'linux_chromium_gn_rel': 'gn_release_bot',
     },
     'tryserver.chromium.linux': {
-      'linux_full_bisect_builder': 'swarming_gyp_release_trybot',
+      'linux_full_bisect_builder': 'swarming_gyp_release_bot',
       'linux_chromium_compile_rel_ng': 'swarming_gyp_release_trybot',
       'linux_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
       'linux_chromium_gn_rel': 'gn_release_trybot',
       'linux_chromium_gn_chromeos_rel': 'chromeos_gn_release_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'linux_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot',
       'linux_chromium_dbg_ng': 'swarming_gyp_debug_trybot',
       'linux_chromium_gn_dbg': 'gn_debug_bot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       'android_chromium_gn_compile_dbg': 'android_gn_debug_bot',
@@ skipping 15 matching lines @@
       'win8_chromium_gn_rel': 'gn_release_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols',
       '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',
     },
   },
 }