summaryrefslogtreecommitdiffstats
path: root/tools/scripts
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-26 13:06:23 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-26 14:23:16 +0000
commit93d3a21009b601d9fcee1c9faa2324625d3b5ed1 (patch)
tree66e052c865def847599ccd8705f98c8b12e79cc9 /tools/scripts
parent228ea0d442e899fa9a95f901f17e47268accd8b7 (diff)
Update to Chromium 45.0.2454.79
Change-Id: Id986be0af632884ae4e7d0fb2023e71c449a9eae Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools/scripts')
-rwxr-xr-xtools/scripts/take_snapshot.py3
-rw-r--r--tools/scripts/version_resolver.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 6746ff9c2..71dcc43c2 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -193,8 +193,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/pdfium')
or file_path.startswith('third_party/psyco_win32')
or file_path.startswith('third_party/scons-2.0.1')
- or file_path.startswith('third_party/trace-viewer/tracing/test_data')
- or file_path.startswith('third_party/trace-viewer/tracing/third_party/v8')
+ or file_path.startswith('third_party/trace-viewer')
or file_path.startswith('third_party/undoview')
or file_path.startswith('third_party/webgl')
or (file_path.startswith('tools') and
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 3e3f77d62..f6aaedf64 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,7 +51,7 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '45.0.2454.40'
+chromium_version = '45.0.2454.79'
chromium_branch = '2454'
ninja_version = 'v1.5.3'