Commit 14072aff authored by Stephen Martinis's avatar Stephen Martinis Committed by Commit Bot

Revert "Revert "Add new gn arg for Linux builds on chromium.perf""

This reverts commit 31c39d8d.

Reason for revert: Trying again.

Original change's description:
> Revert "Add new gn arg for Linux builds on chromium.perf"
> 
> This reverts commit b81f0267.
> 
> Reason for revert: Might have totally broken the builder.
> 
> Original change's description:
> > Add new gn arg for Linux builds on chromium.perf
> > 
> > It appears there's a way to disable using the gnome keyring
> > service on linux, which has been causing our bots issues. Try setting
> > this gn arg to see what happens.
> > 
> > Bug: 732463
> > Change-Id: Iaa1ff400e506ae6245346741d4bcdeaaa695fd4f
> > Reviewed-on: https://chromium-review.googlesource.com/542015
> > Reviewed-by: Kenneth Russell <kbr@chromium.org>
> > Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> > Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#481143}
> 
> TBR=dpranke@chromium.org,kbr@chromium.org,nednguyen@google.com,martiniss@chromium.org
> 
> Change-Id: I96533c8eb48da571ff289834a478f9b896dc414a
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 732463
> Reviewed-on: https://chromium-review.googlesource.com/543537
> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#481213}

TBR=dpranke@chromium.org,kbr@chromium.org,nednguyen@google.com,martiniss@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 732463
Change-Id: I0cf5ee9662adaffcc629832d19c8fcbab0b0c834
Reviewed-on: https://chromium-review.googlesource.com/544686Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481661}
parent d8c99c46
......@@ -339,7 +339,7 @@
'Android arm64 Builder': 'official_goma_minimal_symbols_android_arm64',
'Android Compile': 'official_goma_minimal_symbols_android',
'Android arm64 Compile': 'official_goma_minimal_symbols_android_arm64',
'Linux Builder': 'official_goma',
'Linux Builder': 'official_goma_perf',
'Mac Builder': 'official_goma',
'Win Builder': 'official_goma_x86',
'Win x64 Builder': 'official_goma',
......@@ -1356,6 +1356,10 @@
'official', 'goma',
],
'official_goma_perf': [
'official', 'goma', 'no_gnome_keyring',
],
'official_goma_chromeos': [
'official', 'goma', 'chromeos', 'x11_cros',
],
......@@ -1828,6 +1832,10 @@
'gn_args': 'android_ndk_version="r13b" android_ndk_major_version=13',
},
'no_gnome_keyring': {
'gn_args': 'use_gnome_keyring=false',
},
'no_pch': {
'gn_args': 'enable_precompiled_headers=false',
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment