From 041b7df767b2af31010cf2972aa9dcb0171b0937 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 7 Dec 2016 17:42:30 +0100 Subject: Qt GN integration Exclude source files we override in the qt webengine sources. Change-Id: I79925220265602bd0c39e5e03162cf1dca15befe Reviewed-by: Michal Klocek Reviewed-by: Allan Sandfeld Jensen --- chromium/content/browser/BUILD.gn | 39 +++++++++++++++++++++++++++++++++++++++ chromium/content/common/BUILD.gn | 6 ++---- 2 files changed, 41 insertions(+), 4 deletions(-) (limited to 'chromium/content') diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index dfffabe1170..2a1d3041bd4 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -2264,6 +2264,45 @@ source_set("browser") { "hyphenation/hyphenation_impl.h", ] } + + if (use_qt) { + if (is_win) { + sources -= [ + "accessibility/browser_accessibility_com_win.cc", + "accessibility/browser_accessibility_com_win.h", + "accessibility/browser_accessibility_event_win.cc", + "accessibility/browser_accessibility_event_win.h", + "accessibility/browser_accessibility_manager_win.cc", + "accessibility/browser_accessibility_manager_win.h", + "accessibility/browser_accessibility_win.cc", + "accessibility/browser_accessibility_win.h", + ] + } + if (use_aura) { + sources -= [ + "renderer_host/native_web_keyboard_event_aura.cc", + "renderer_host/render_widget_host_view_aura.cc", + "renderer_host/render_widget_host_view_aura.h", + "web_contents/web_contents_view_aura.h", + "web_contents/web_contents_view_aura.cc", + ] + } else if (is_mac) { + sources -= [ + "accessibility/accessibility_tree_formatter_mac.mm", + "accessibility/browser_accessibility_cocoa.mm", + "accessibility/browser_accessibility_cocoa.h", + "accessibility/browser_accessibility_mac.mm", + "accessibility/browser_accessibility_mac.h", + "accessibility/browser_accessibility_manager_mac.mm", + "accessibility/browser_accessibility_manager_mac.h", + "renderer_host/native_web_keyboard_event_mac.mm", + "renderer_host/render_widget_host_view_mac.mm", + "renderer_host/render_widget_host_view_mac.h", + "web_contents/web_contents_view_mac.mm", + "web_contents/web_contents_view_mac.h", + ] + } + } } buildflag_header("accessibility_flags") { diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn index d607aae096c..5a97f68b810 100644 --- a/chromium/content/common/BUILD.gn +++ b/chromium/content/common/BUILD.gn @@ -515,11 +515,9 @@ source_set("common") { sources -= [ "cursors/webcursor_aurax11.cc" ] } - if (is_linux) { + if (is_linux && !use_qt) { deps += [ "//third_party/fontconfig" ] - } - - if (is_mac || is_win || is_android || is_fuchsia) { + } else { sources -= [ "font_list_fontconfig.cc" ] } -- cgit v1.2.1