Fix the GN upload (build) flags to not depend on GN.

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_gn_release_bot': ['android', 'gn', 'release_bot'],
     'android_gn_debug_bot': ['android', 'gn', 'debug_bot'],
     'android_gn_release_trybot': ['android', 'gn', 'release_trybot'],
     'android_gyp_debug_bot': ['android', 'gyp', 'debug_bot'],
     'android_gyp_release_trybot': ['android', 'gyp', 'release_trybot'],
     'chromeos_gn_debug_bot': ['chromeos', 'gn', 'debug_bot'],
     'chromeos_gn_release_bot': ['chromeos', 'gn', 'release_bot'],
     'chromeos_gn_release_trybot': ['chromeos', 'gn', 'release_trybot'],
     'dev_gn_debug': ['gn', 'debug', 'shared', 'full_symbols'],
     'dev_gyp_debug': ['gyp', 'debug', 'shared', 'full_symbols'],
     'dev_gn_release': ['gn', 'release', 'shared'],
     'dev_gyp_release': ['gyp', 'release', 'shared'],
+    'gn_linux_upload': ['gn_linux_upload'],
     'gn_release_bot': ['gn', 'release_bot'],
     'gn_release_bot_x86': ['gn', 'release_bot', 'x86'],
     'gn_release_trybot': ['gn', 'release_trybot'],
     'gn_release_trybot_x86': ['gn', 'release_trybot', 'x86'],
     'gn_debug_bot': ['gn', 'debug_bot'],
     'gn_debug_bot_x86': ['gn', 'debug_bot', 'x86'],
     'gn_debug_static_bot': ['gn', 'debug_static_bot'],
     'gn_debug_static_bot_x86': ['gn', 'debug_static_bot', 'x86'],
     'gyp_release_bot': ['gyp', 'release_bot'],
   },
@@ skipping 48 matching lines @@
 
     'debug_static_bot': {
       'mixins': ['debug', 'static', 'minimal_symbols', 'goma']
     },
 
     'full_symbols': {
       'gn_args': 'symbol_level=2',
       'gyp_defines': 'fastbuild=0',
     },
 
+    'gn_linux_upload': {
+      'type': 'gn',
+
+      # We don't want to require a runtime dependency on glib in the
+      # 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': {'type': 'gyp'},
 
     'minimal_symbols': {
@@ skipping 85 matching lines @@
       'android_chromium_gn_compile_rel': 'android_gn_release_bot',
       'linux_chromium_gn_rel': 'gn_release_bot',
     },
     'tryserver.chromium.linux': {
       'android_chromium_gn_compile_dbg': 'android_gn_debug_bot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'linux_chromium_gn_chromeos_rel': 'chromeos_gn_release_trybot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       'linux_chromium_gn_dbg': 'gn_debug_bot',
       'linux_chromium_gn_rel': 'gn_release_trybot',
-      'linux_chromium_gn_upload': 'gn_release_bot',
-      'linux_chromium_gn_upload_x64': 'gn_release_bot', # TODO(dpranke): Remove me.
-      'linux_chromium_gn_upload_x86': 'gn_release_bot_x86', # TODO(dpranke): Remove me.
+      'linux_chromium_gn_upload': 'gn_linux_upload',
     },
     'tryserver.chromium.mac': {
       'mac_chromium_gn_dbg': 'gn_debug_static_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
     },
     'tryserver.chromium.win': {
       'win_chromium_gn_x64_dbg': 'gn_debug_static_bot',
       'win_chromium_gn_x64_rel': 'gn_release_trybot',
       'win8_chromium_gn_dbg': 'gn_debug_static_bot_x86',
       'win8_chromium_gn_rel': 'gn_release_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
     },
   },
 }