Revert "SimpleChrome: Update GN args to make LLD default linker for Chrome."
This reverts commit fa5cbe8e521f3c878983954159afad12a1f6e61a.
Reason for revert: Seems to be causing bad images in Chrome OS using
simple-chrome-built images (see
https://bugs.chromium.org/p/chromium/issues/detail?id=917504).
Original change's description:
> SimpleChrome: Update GN args to make LLD default linker for Chrome.
>
> LLD has been the default linker for Chrome in Chrome OS for
> nearly two weeks. It is blocked from automatically becoming the
> default linker in Simple Chrome by crosbug/913317. This forces
> LLD to be the linker for Chrome, until that bug can be fixed.
>
> BUG=chromium:862442
> TEST=LLD has been used for building Chrome in Chrome OS for two
> weeks.
>
> Change-Id: I3e596f088dbf69c4288906fe375a1db3ddce7555
> Reviewed-on: https://chromium-review.googlesource.com/1387171
> Commit-Ready: Caroline Tice <cmtice@chromium.org>
> Tested-by: Caroline Tice <cmtice@chromium.org>
> Reviewed-by: Luis Lozano <llozano@chromium.org>
Bug: chromium:862442
Change-Id: I8559830759eec480fa79f74d6e40d2d8c4fd4c90
Reviewed-on: https://chromium-review.googlesource.com/c/1389515
Reviewed-by: Luis Lozano <llozano@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Trybot-Ready: Caroline Tice <cmtice@chromium.org>
diff --git a/cli/cros/cros_chrome_sdk.py b/cli/cros/cros_chrome_sdk.py
index ce24957..a4c2ee2 100644
--- a/cli/cros/cros_chrome_sdk.py
+++ b/cli/cros/cros_chrome_sdk.py
@@ -1055,10 +1055,6 @@
gn_args.pop('internal_khronos_glcts_tests', None) # crbug.com/588080
- # Update to use LLD as linker for building Chrome. This is only needed
- # until crosbug/913317 is fixed.
- gn_args['use_lld'] = True
-
# Disable ThinLTO and CFI for simplechrome. Tryjob machines do not have
# enough file descriptors to use. crbug.com/789607
if not options.thinlto and 'use_thin_lto' in gn_args:
