From ab94349cb2fa073e8aec661a797de1cfc3819752 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 25 Jan 2017 15:09:31 +0100 Subject: Simple adaptations to Chromium 55 The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek --- src/core/qtwebengine.gni | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/core/qtwebengine.gni') diff --git a/src/core/qtwebengine.gni b/src/core/qtwebengine.gni index 4e561e7a9..8fa018038 100644 --- a/src/core/qtwebengine.gni +++ b/src/core/qtwebengine.gni @@ -1,11 +1,9 @@ +import("//third_party/widevine/cdm/widevine.gni") + chromium_version = exec_script("//build/util/version.py", [ "-f", rebase_path("//chrome/VERSION"), "-t", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"], "list lines") -declare_args() { - use_qt = true -} - include_dirs = [ "//skia/config", "//third_party/skia/include/core" @@ -13,20 +11,17 @@ include_dirs = [ deps = [ "//base", - "//components/cdm/renderer", - "//components/devtools_http_handler", "//components/error_page/common", "//components/keyed_service/content", "//components/visitedlink/browser", "//components/visitedlink/renderer", "//components/web_cache/browser", - "//components/web_cache/public/interfaces", "//components/web_cache/renderer", "//content/public/app:browser", "//content/public/browser", "//content/public/common", + "//content/public/renderer", "//net:net_browser_services", - "//services/shell/public/cpp", "//skia", "//third_party/WebKit/public:blink", "//third_party/widevine/cdm:version_h", @@ -40,8 +35,10 @@ if (enable_widevine) { deps += [ "//components/cdm/renderer"] } -# fixme: +if (is_linux && !is_desktop_linux) { + deps += [ "//ui/events/ozone:events_ozone_evdev"] +} + defines = [ - "QTWEBENGINEPROCESS_NAME=\"QtWebEngineProcess\"", "CHROMIUM_VERSION=\"" + chromium_version[0] + "\"" ] -- cgit v1.2.3