From b43dfcc6f4c1a8c54a2a2e50230d5b1a8d68eef1 Mon Sep 17 00:00:00 2001 From: brettw Date: Thu, 23 Jun 2016 20:04:28 -0700 Subject: [PATCH] Make GN components static libraries on Win x64 For the static builds, previously there was a static library exception for the windows official builds. They were source sets instead on the theory that some of them could get over 2GB. There's only one component over 2GB (blink_modules). The rest of the targets that were too large before were all explicit static libraries which have been dealt with already. This change whitelists blink_modules. After that, the largest static library is now blink_platform (1.2GB). The rest are less than 1 GB. So we can now disable the special case for this configuration. BUG=619949 Review-Url: https://codereview.chromium.org/2098673002 Cr-Original-Commit-Position: refs/heads/master@{#401800} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: d28aba56dde82051680f9048daf1b1501b9bd89a --- config/BUILDCONFIG.gn | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn index af9fac390..554249f24 100644 --- a/config/BUILDCONFIG.gn +++ b/config/BUILDCONFIG.gn @@ -633,15 +633,10 @@ template("component") { assert(invoker.static_component_type == "static_library" || invoker.static_component_type == "source_set") _component_mode = invoker.static_component_type - } else if (!defined(invoker.sources) || is_mac || - (is_win && is_official_build)) { + } else if (!defined(invoker.sources) || is_mac) { # When there are no sources defined, use a source set to avoid creating # an empty static library (which generally don't work). # - # On Windows official builds, the link time code generation bloats static - # libraries to the point where some of them become >32 bits large which - # causes lib.exe to fail. Always use source sets for that configuration. - # # TODO(brettw) bug 618797: Remove the mac condition. On Mac making these as # static_library causes crashes. Remove the mac condition above when this # is fixed.