diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-04 17:47:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-07 10:17:37 +0200 |
| commit | 2893bc8f0b6432b9b1c686a93cdca94a36418308 (patch) | |
| tree | f3113ca4b73b4f3caab57a4776602fbe0b0d6755 /tools | |
| parent | 98bbdd3330171332c8b73aa5329d24e7780c4661 (diff) | |
Adaptations for Chromium 80
Change-Id: Icaf68648cbc2c13a61fc3b208ff1e64ca36c90b6
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 5 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index dffdcbc11..8ec0a898e 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -159,7 +159,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/chromite') or file_path.startswith('third_party/colorama') or file_path.startswith('third_party/depot_tools') - or file_path.startswith('third_party/devtools-node-modules') + or file_path.startswith('third_party/devtools-frontend/src/node-modules/') or file_path.startswith('third_party/fuschsia-sdk/') or file_path.startswith('third_party/glslang/src/Test/') or file_path.startswith('third_party/google_') @@ -193,7 +193,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/skia/infra') 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/') + 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') or file_path.startswith('third_party/webgl') @@ -231,6 +231,7 @@ def isInChromiumBlacklist(file_path): not '/webrtc/' in file_path and not file_path.startswith('net/test/') and not file_path.endswith('mock_chrome_application_mac.h') and + not file_path.endswith('test_mock_time_task_runner.h') and not file_path.endswith('perftimer.h') and not file_path.endswith('test-torque.tq') and not file_path.endswith('fonts.conf') and diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 58d5aa19d..20141e4b2 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 = '79.0.3945.147' -chromium_branch = '3945' +chromium_version = '80.0.3987.136' +chromium_branch = '3987' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |