diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-09 17:25:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 08:17:30 +0000 |
| commit | 7757ec1a562ae36b65a6cae93b3cd308247755ef (patch) | |
| tree | 9da058ac021019317111dd1ad90c0a4a32529afe /tools | |
| parent | 57c49df9c6fcbaaffc66900e191312d4e0a0edfa (diff) | |
Adaptations for Chromium 67
Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/scripts/git_submodule.py | 2 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 1 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index bf931563c..684a8af67 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -67,7 +67,7 @@ class DEPSParser: url = '' if (type(scope[dep]) == str): url = scope[dep] - elif (type(scope[dep]) == dict): + elif (type(scope[dep]) == dict and 'url' in scope[dep]): url = scope[dep]['url'] if ('condition' in scope[dep]) and (not 'checkout_linux' in scope[dep]['condition']): diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 50191621a..6cb55e5c4 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -242,6 +242,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('ui/events/ozone/chromeos') or file_path.startswith('ui/file_manager') or file_path.startswith('ui/gfx/chromeos') + or file_path.startswith('v8/third_party/antlr4') ): return True diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 21fae9ee4..748205d51 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 = '66.0.3359.156' -chromium_branch = '3359' +chromium_version = '67.0.3396.76' +chromium_branch = '3396' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |