diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-23 14:43:14 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-15 18:11:44 +0200 |
| commit | 027e7e574e7a4488d47cd4133e98d518210b1e56 (patch) | |
| tree | c45f05457509b7d99c39a3889119c04c4aee39e3 /tools | |
| parent | 2dce0008ce53d27d281ad2dc00eb32d25ae5fc84 (diff) | |
Adaptations for Chromium 88
Change-Id: Ie66e95dbb9fbcafe961bb98d5c277f8c32d66b96
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 1 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index b2c1276af..cc18847b2 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -198,7 +198,6 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/skia/infra') or file_path.startswith('third_party/skia/site/dev/tools/calendar.mskp') or file_path.startswith('third_party/sqlite/sqlite-src-') - or file_path.startswith('third_party/speech-dispatcher') or file_path.startswith('third_party/spirv-cross/spirv-cross/reference/') or file_path.startswith('third_party/swiftshader/third_party/') or file_path.startswith('third_party/wayland') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index dd5470f88..264484d4c 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 = '87.0.4280.144' -chromium_branch = '4280' +chromium_version = '88.0.4324.187' +chromium_branch = '4324' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' @@ -54,6 +54,14 @@ submodule_blacklist = [ , 'chrome/tools/test/reference_build/chrome_mac' , 'chrome/tools/test/reference_build/chrome_linux' , 'chrome/tools/test/reference_build/chrome_win' + # buildtools duplicates: + , 'buildtools/clang_format/script' + , 'buildtools/linux64' + , 'buildtools/mac' + , 'buildtools/win' + , 'buildtools/third_party/libc++/trunk' + , 'buildtools/third_party/libc++abi/trunk' + , 'buildtools/third_party/libunwind/trunk' ] sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts')) |