diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-24 18:41:20 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:13:01 +0200 |
| commit | e45e2af927bee03e7f2209b4d717a8c3555cde23 (patch) | |
| tree | 6a64b6e7e44a284cec96150924ea6996709e3ebe | |
| parent | 21f5af631e538d69c3d9b659b6681179dcde970f (diff) | |
| download | qtwebengine-chromium-e45e2af927bee03e7f2209b4d717a8c3555cde23.tar.gz | |
<chromium> Get rid of the gtk/pango/cairo dependency
This also removes the aura dependency to chrome resources
since we repack the needed resources ourselves.
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Change-Id: I0368bb36948ba9612040ed869ef818d4b8471b9b
| -rw-r--r-- | chromium/build/linux/system.gyp | 6 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/render_sandbox_host_linux.cc | 2 | ||||
| -rw-r--r-- | chromium/content/renderer/npapi/webplugin_delegate_proxy.cc | 2 | ||||
| -rw-r--r-- | chromium/ui/aura/aura.gyp | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp index 4a7e857efc1..1451afbd214 100644 --- a/chromium/build/linux/system.gyp +++ b/chromium/build/linux/system.gyp @@ -29,7 +29,7 @@ 'use_system_ssl%': 1, }, }], - [ 'chromeos==0', { + [ 'chromeos==0 and use_qt==0', { # Hide GTK and related dependencies for Chrome OS, so they won't get # added back to Chrome OS. Don't try to use GTK on Chrome OS. 'targets': [ @@ -660,6 +660,8 @@ 'type': 'none', 'toolsets': ['host', 'target'], 'conditions': [ + ['use_pango==1', { + 'conditions': [ ['_toolset=="target"', { 'direct_dependent_settings': { 'cflags': [ @@ -690,6 +692,8 @@ }, }], ], + }], + ], }, { 'target_name': 'ssl', diff --git a/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc b/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc index 19cbc5b4b35..f4e1cfc6e41 100644 --- a/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -709,7 +709,7 @@ void RenderSandboxHostLinux::Init(const std::string& sandbox_path) { childs_lifeline_fd_ = pipefds[1]; // We need to be monothreaded before we fork(). -#if !defined(TOOLKIT_GTK) +#if !defined(TOOLKIT_GTK) && !defined(TOOLKIT_QT) // Exclude gtk port as TestSuite in base/tests/test_suite.cc is calling // gtk_init. // TODO(oshima): Remove ifdef when above issues are resolved. diff --git a/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc b/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc index d7f847240b0..a6418fb5a8f 100644 --- a/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -6,7 +6,7 @@ #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> -#elif defined(USE_X11) +#elif defined(USE_CAIRO) #include <cairo/cairo.h> #endif diff --git a/chromium/ui/aura/aura.gyp b/chromium/ui/aura/aura.gyp index 68164d4321a..139e0469ef2 100644 --- a/chromium/ui/aura/aura.gyp +++ b/chromium/ui/aura/aura.gyp @@ -243,7 +243,6 @@ 'type': 'executable', 'dependencies': [ '../../base/base.gyp:test_support_base', - '../../chrome/chrome_resources.gyp:packed_resources', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', '../compositor/compositor.gyp:compositor', |