diff options
| author | dpranke <dpranke@chromium.org> | 2015-06-05 14:39:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 21:40:16 +0000 |
| commit | 5a47c761a09130cd75332b443c92f7e312070b26 (patch) | |
| tree | 581dbdd016cdf049397ceb57acc8f8254fd2a26e | |
| parent | a7815e75ec645c78465c5dc32c5b0ebfb4372c0c (diff) | |
| download | chromium_src-5a47c761a09130cd75332b443c92f7e312070b26.zip chromium_src-5a47c761a09130cd75332b443c92f7e312070b26.tar.gz chromium_src-5a47c761a09130cd75332b443c92f7e312070b26.tar.bz2 | |
Fix the GN upload (build) flags to not depend on GN.
This changes the GN args we use on the linux_chromium_gn_upload
bot to not require a runtime dependency on GN.
This CL also deletes the old ntries for the 32-bit and 64-bit
upload bots (we just do 64-bit now, using the newer builder named
linux_chromium_gn_upload).
TBR=brettw@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1168743003
Cr-Commit-Position: refs/heads/master@{#333140}
| -rw-r--r-- | tools/mb/mb_config.pyl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index 1ec74f9..2dcc79c 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl @@ -21,6 +21,7 @@ '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'], @@ -89,6 +90,16 @@ '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': { @@ -194,9 +205,7 @@ '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', |