Exclude source files which are provided by qt webengine sources

Since GN can't do global exclude like GYP, fix BUILD.gn files
instead. Only Linux builds are fixed so far.

Change-Id: I670b7f40675eb25efc762cd821b246f61840a426
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 44 insertions, 6 deletions

diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni
index 279d63bed6c..bb7d245ba86 100644
--- a/chromium/build/config/ui.gni
+++ b/chromium/build/config/ui.gni
@@ -62,19 +62,22 @@ declare_args() {
 
 # Use GPU accelerated cross process image transport by default on linux builds
 # with the Aura window manager.
-ui_compositor_image_transport = use_aura && is_linux
+ui_compositor_image_transport = use_aura && is_linux && !use_qt
 
 use_default_render_theme = use_aura && !is_android
 
 # Indicates if the UI toolkit depends on X11.
 use_x11 = is_linux && !use_ozone
 
+# Indicates if the UI toolkit depends on GTK.
+use_gtk = use_x11 && !use_qt
+
 # Turn off glib if Ozone is enabled.
 if (use_ozone) {
   use_glib = false
 }
 
-if (is_linux && !use_ozone) {
+if (use_gtk) {
   use_cairo = true
   use_pango = true
 } else {
@@ -83,7 +86,7 @@ if (is_linux && !use_ozone) {
 }
 
 # Whether to use atk, the Accessibility ToolKit library
-use_atk = is_desktop_linux && use_x11
+use_atk = is_desktop_linux && use_gtk
 
 use_clipboard_aurax11 =
-    (is_desktop_linux && use_aura && use_x11) || enable_clipboard_aurax11
+    (is_desktop_linux && use_aura && use_x11 && !use_qt) || enable_clipboard_aurax11
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 87664fbaf48..73b0fd50114 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -504,6 +504,16 @@ source_set("browser") {
   if (enable_ipc_fuzzer) {
     configs += [ "//tools/ipc_fuzzer:ipc_fuzzer_config" ]
   }
+
+  if (use_qt && is_linux) {
+    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",
+    ]
+  }
 }
 
 # See comment at the top of //content/BUILD.gn for how this works.
diff --git a/chromium/gpu/ipc/service/BUILD.gn b/chromium/gpu/ipc/service/BUILD.gn
index 90ebedb7165..7e75e8de5b3 100644
--- a/chromium/gpu/ipc/service/BUILD.gn
+++ b/chromium/gpu/ipc/service/BUILD.gn
@@ -93,7 +93,7 @@ source_set("ipc_service_sources") {
     ]
     libs += [ "android" ]
   }
-  if (is_linux) {
+  if (is_linux && ui_compositor_image_transport) {
     sources += [ "image_transport_surface_linux.cc" ]
   }
   if (use_x11) {
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index f56d72e1031..feef68ddfbd 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -591,7 +591,7 @@ component("base") {
   }
 
   # Aura clipboard.
-  if (use_aura) {
+  if (use_aura && !use_qt) {
     if (use_clipboard_aurax11) {
       sources += [
         "clipboard/clipboard_aurax11.cc",
@@ -609,6 +609,14 @@ component("base") {
   if (is_android || is_ios) {
     sources -= [ "device_form_factor_desktop.cc" ]
   }
+
+  if (use_qt && is_linux) {
+   sources -= [
+     "resource/resource_bundle_auralinux.cc",
+     "dragdrop/os_exchange_data_provider_aurax11.cc",
+     "dragdrop/os_exchange_data_provider_aurax11.h",
+   ]
+  }
 }
 
 source_set("test_support") {
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn
index ff658533ba1..a38a5b3b95d 100644
--- a/chromium/ui/gl/BUILD.gn
+++ b/chromium/ui/gl/BUILD.gn
@@ -285,6 +285,17 @@ component("gl") {
       "//ui/android:ui_java",
     ]
   }
+
+  if (use_qt && is_linux) {
+    sources -= [
+      "gl_surface_egl.cc",
+      "gl_surface_egl.h",
+      "gl_surface_egl_x11.cc",
+      "gl_surface_egl_x11.h",
+      "gl_surface_glx.cc",
+      "gl_surface_glx.h",
+    ]
+  }
 }
 
 source_set("gl_unittest_utils") {
diff --git a/chromium/ui/gl/init/BUILD.gn b/chromium/ui/gl/init/BUILD.gn
index 2a0eb6df076..ca5ad779098 100644
--- a/chromium/ui/gl/init/BUILD.gn
+++ b/chromium/ui/gl/init/BUILD.gn
@@ -59,4 +59,10 @@ component("init") {
 
     deps += [ "//ui/ozone" ]
   }
+
+  if (use_qt && use_x11) {
+    sources -= [
+      "gl_initializer_x11.cc",
+    ]
+  }
 }