summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-27 17:56:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-22 08:47:36 +0000
commit5d0fbf8a6890c395c0cdc0c60e775b70c95e15ed (patch)
treec6354b09515a9110c121e3a3f3e97dd94b9b788a /tools
parent43b7af20c421e4ffb20cd4625f3b704e78e7325d (diff)
General adaptations for Chromium 69
Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/take_snapshot.py1
-rw-r--r--tools/scripts/version_resolver.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 8f841b9eb..442b5fe2a 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -72,6 +72,7 @@ def isInChromiumBlacklist(file_path):
not file_path.endswith('perftimer.h') and
not file_path.endswith('test-torque.tq') and
not 'ozone' in file_path and
+ not 'fontconfig_util_linux' in file_path and
not 'core/mojo/test/' in file_path and
not file_path.startswith('extensions/browser/'))
or file_path.endswith('.java')
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 22f2797ad..5482add66 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,8 +38,8 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '68.0.3440.125'
-chromium_branch = '3440'
+chromium_version = '69.0.3497.70'
+chromium_branch = '3497'
ninja_version = 'v1.8.2'
json_url = 'http://omahaproxy.appspot.com/all.json'