diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-09 10:12:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-04 10:21:06 +0200 |
| commit | 812e2db7c43a5773d8cd1a0e20bbfa1576413fc1 (patch) | |
| tree | d1535467af462923f61420bb1fa4f5722a494c4b /chromium/ui/gl | |
| parent | ef7f6c6ae7463d0e14bf15c57fb0ed5c2626c7c1 (diff) | |
| download | qtwebengine-chromium-812e2db7c43a5773d8cd1a0e20bbfa1576413fc1.tar.gz | |
Reinstate jumbo-builds
Reverts four patches disabling and removing jumbo builds.
It makes too big of a difference for us to drop.
Change-Id: Ib7dd65996f9e985480f49fab2d1781a5d08bf6fd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/ui/gl')
| -rw-r--r-- | chromium/ui/gl/BUILD.gn | 7 | ||||
| -rw-r--r-- | chromium/ui/gl/init/BUILD.gn | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn index 67cff458127..6cdcd9d91d5 100644 --- a/chromium/ui/gl/BUILD.gn +++ b/chromium/ui/gl/BUILD.gn @@ -6,6 +6,7 @@ import("//build/buildflag_header.gni") import("//build/config/chrome_build.gni") import("//build/config/chromecast_build.gni") import("//build/config/chromeos/ui_mode.gni") +import("//build/config/jumbo.gni") import("//build/config/linux/pkg_config.gni") import("//build/config/ozone.gni") import("//build/config/ui.gni") @@ -46,7 +47,7 @@ config("gl_config") { } } -component("gl") { +jumbo_component("gl") { output_name = "gl_wrapper" # Avoid colliding with OS X"s libGL.dylib. sources = [ @@ -488,7 +489,7 @@ if (is_mac && use_egl) { } } -static_library("gl_unittest_utils") { +jumbo_static_library("gl_unittest_utils") { testonly = true sources = [ "egl_bindings_autogen_mock.cc", @@ -514,7 +515,7 @@ static_library("gl_unittest_utils") { ] } -static_library("test_support") { +jumbo_static_library("test_support") { testonly = true sources = [ "test/gl_image_bind_test_template.h", diff --git a/chromium/ui/gl/init/BUILD.gn b/chromium/ui/gl/init/BUILD.gn index 62763048aff..2d6c7c2b152 100644 --- a/chromium/ui/gl/init/BUILD.gn +++ b/chromium/ui/gl/init/BUILD.gn @@ -2,10 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/jumbo.gni") import("//build/config/ui.gni") import("//ui/gl/features.gni") -component("init") { +jumbo_component("init") { output_name = "gl_init" public = [ |