BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 10 insertions, 9 deletions

diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn
index 0b86ac6e032..ce8128b4092 100644
--- a/chromium/build/config/win/BUILD.gn
+++ b/chromium/build/config/win/BUILD.gn
@@ -13,12 +13,6 @@ import("//build/toolchain/toolchain.gni")
 
 assert(is_win)
 
-if (disable_goma) {
-  goma_disabled = "true"
-} else {
-  goma_disabled = "false"
-}
-
 declare_args() {
   # Set this to true to enable static analysis through Visual Studio's
   # /analyze. This dramatically slows compiles and reports thousands of
@@ -102,7 +96,7 @@ config("compiler") {
     lib_dirs = [ "$clang_base_path/lib/clang/$clang_version/lib/windows" ]
   }
 
-  if (use_lld && !use_thin_lto) {
+  if (use_lld && !use_thin_lto && (is_clang || !use_goma)) {
     # /Brepro lets the compiler not write the mtime field in the .obj output.
     # link.exe /incremental relies on this field to work correctly, but lld
     # never looks at this timestamp, so it's safe to pass this flag with
@@ -124,6 +118,12 @@ config("compiler") {
       "/FIXED:NO",
     ]
 
+    if (use_lld) {
+      # String tail merging leads to smaller binaries, but they don't compress
+      # as well, leading to increased mini_installer size (crbug.com/838449).
+      ldflags += [ "/OPT:NOLLDTAILMERGE" ]
+    }
+
     # TODO(siggi): Is this of any use anymore?
     # /PROFILE ensures that the PDB file contains FIXUP information (growing the
     # PDB file by about 5%) but does not otherwise alter the output binary. It
@@ -193,6 +193,7 @@ config("vs_code_analysis") {
 # :runtime_library vs. :compiler.
 config("runtime_library") {
   cflags = []
+  cflags_cc = []
 
   # Defines that set up the CRT.
   defines = [
@@ -225,7 +226,8 @@ config("runtime_library") {
   }
 
   if (use_custom_libcxx) {
-    cflags_cc = [ "-I" + rebase_path("$libcxx_prefix/include", root_build_dir) ]
+    cflags_cc +=
+        [ "-I" + rebase_path("$libcxx_prefix/include", root_build_dir) ]
     if (libcpp_is_static) {
       defines += [ "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS" ]
     }
@@ -319,7 +321,6 @@ config("sdk_link") {
                                         current_os,
                                         current_cpu,
                                         "none",
-                                        goma_disabled,
                                       ],
                                       "scope")