diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-04 16:30:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-10 14:17:53 +0000 |
| commit | d1f120df8b53caa424253bed8ca00b4a35f75a73 (patch) | |
| tree | b2fb23059aa82c7c633229a0142ab9faba3998c5 | |
| parent | e396e78c7c0252bf7c7f6ae3879c376ac3fea19c (diff) | |
| download | qtwebengine-chromium-d1f120df8b53caa424253bed8ca00b4a35f75a73.tar.gz | |
FIXUP: Qt GN integration
Change-Id: I55864bfc1e8715b11f7692eaea62d837eee609eb
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/components/proxy_config/BUILD.gn | 12 | ||||
| -rw-r--r-- | chromium/ui/gl/BUILD.gn | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/chromium/components/proxy_config/BUILD.gn b/chromium/components/proxy_config/BUILD.gn index 4e09932830b..cc0966c786e 100644 --- a/chromium/components/proxy_config/BUILD.gn +++ b/chromium/components/proxy_config/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") +import("//build/config/features.gni") component("proxy_config") { sources = [ @@ -33,6 +34,17 @@ component("proxy_config") { "//net", "//url", ] + if (use_qt) { + sources -= [ + "proxy_policy_handler.cc", + "proxy_policy_handler.h", + ] + deps -= [ + "//components/policy:generated", + "//components/policy/core/browser", + "//components/policy/core/common", + ] + } # TODO(https://crbug.com/562773): Break a header include cycle on ChromeOS # and disable include checking so GN doesn't complain about the missing diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn index c0283a8b1e4..18cd6996034 100644 --- a/chromium/ui/gl/BUILD.gn +++ b/chromium/ui/gl/BUILD.gn @@ -476,7 +476,7 @@ jumbo_component("gl") { "gl_surface_egl.h", ] } - if (is_linux) { + if (is_linux && ozone_platform_x11) { sources += [ "gl_image_egl_pixmap.cc", "gl_image_egl_pixmap.h", |