diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-04-14 16:03:59 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-07-06 11:40:12 +0200 |
| commit | 96abe0c83c7399cf771eb5155998c706a2243f0e (patch) | |
| tree | b936e8a40dc7e3faa1e1e43e34bff2401fbf4f83 /tools/scripts | |
| parent | d488349ee0ecac8a2e5a87a18d249c7b5de39152 (diff) | |
Adaptations for Chromium 112
Pick-to: 6.6
Change-Id: I1bb84b20a080d7f615bf0795ac2d97739e99ac1d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tools/scripts')
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 8 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 41cd46b3c..735660e2a 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -41,7 +41,6 @@ def isInChromiumBlacklist(file_path): if (file_path.startswith('android_webview') or file_path.startswith('apps/') or file_path.startswith('ash/') - or file_path.startswith('base/android') or file_path.startswith('buildtools/clang_format/script') or file_path.startswith('buildtools/third_party/libc++') or file_path.startswith('buildtools/third_party/libc++abi') @@ -118,7 +117,10 @@ def isInChromiumBlacklist(file_path): or (file_path.startswith('net/data/') and '_unittest/' in file_path) or file_path.startswith('net/data/fuzzer_data/') - or file_path.startswith('remoting') + or (file_path.startswith('remoting') + and not file_path.endswith('VERSION') + and not file_path.endswith('branding_Chromium') + and not file_path.endswith('remove_spaces.py')) or file_path.startswith('rlz') or file_path.startswith('testing/android') or file_path.startswith('testing/buildbot') @@ -155,6 +157,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-frontend/src/third_party/image_diff') or (file_path.startswith('third_party/node/node_modules/') and not file_path.startswith('third_party/node/node_modules/@babel/') and not file_path.startswith('third_party/node/node_modules/@types/d3') @@ -180,6 +183,7 @@ def isInChromiumBlacklist(file_path): and not file_path.startswith('third_party/node/node_modules/indent/') and not file_path.startswith('third_party/node/node_modules/is-core-module/') and not file_path.startswith('third_party/node/node_modules/is-windows/') + and not file_path.startswith('third_party/node/node_modules/@jridgewell/') and not file_path.startswith('third_party/node/node_modules/js-tokens/') and not file_path.startswith('third_party/node/node_modules/jsesc/') and not file_path.startswith('third_party/node/node_modules/jsonschema/') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 9dd60b477..b5e6f67b8 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -43,8 +43,8 @@ class DEPSParser(ABC): return self.local_scope["recursedeps"] -chromium_version = '108.0.5359.220' -chromium_branch = '5359' +chromium_version = '112.0.5615.213' +chromium_branch = '5615' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |