diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-10-04 11:40:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-10-04 10:19:35 +0000 |
| commit | 7b0b30ace1115b71a408cceeff9f77f13554c333 (patch) | |
| tree | 24753cfafe0983b563a7d955152fe3b289ef0493 /tools/scripts | |
| parent | 39d4776463db955da0469be5f8cd20f29fe8aee0 (diff) | |
Update Chromium
Change-Id: Icf960eb9347e2f2f8a41bbfdb35636154fd4a382
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tools/scripts')
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 3 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 1c65c47ed..053746f79 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -91,9 +91,12 @@ def isInChromiumBlacklist(file_path): not 'third_party/chromevox' in file_path and not 'media/desktop_media_list.h' in file_path and not 'media/desktop_streams_registry.' in file_path and + not 'common/chrome_constants.' in file_path and + not 'common/chrome_paths' in file_path and not 'common/chrome_switches.' in file_path and not 'common/content_restriction.h' in file_path and not 'common/spellcheck_' in file_path and + not 'common/url_constants' in file_path and not '/extensions/api/' in file_path and not '/extensions/browser/api/' in file_path and not '/extensions/permissions/' in file_path and diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 181700d92..e481f0ed0 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,7 +38,7 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '53.0.2785.117' +chromium_version = '53.0.2785.148' chromium_branch = '2785' ninja_version = 'v1.7.1' |