diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-17 17:51:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-28 19:03:32 +0000 |
| commit | e63b35763907304089d961bc3e284178d36c69a3 (patch) | |
| tree | e3fe946240ddfe6b29ce5b72dd16a1db6855f4f1 /tools | |
| parent | 5e66cbc85a350616070a318f917cb181313c4afa (diff) | |
Adaptations for Chromium 70
Change-Id: I8bb77784dbc8a0b9debd96a4c49421bd34e6a0df
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 3 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 4bf4381cb..38915f2e5 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -72,6 +72,7 @@ def isInChromiumBlacklist(file_path): not file_path.endswith('perftimer.h') and not file_path.endswith('test-torque.tq') and not 'ozone' in file_path and + not 'clang_coverage' in file_path and not 'fontconfig_util_linux' in file_path and not 'core/mojo/test/' in file_path and not file_path.startswith('extensions/browser/')) @@ -98,6 +99,7 @@ def isInChromiumBlacklist(file_path): not 'media/webrtc/desktop_media_list.h' in file_path and not 'media/webrtc/desktop_streams_registry.' in file_path and not 'browser/net/chrome_mojo_proxy_resolver_factory.' in file_path and + not '/browser/accessibility/' in file_path and not '/browser/custom_handlers/' in file_path and not '/browser/devtools/' in file_path and not '/browser/ui/webui/' in file_path and @@ -342,6 +344,7 @@ def exportChromium(): files = listFilesInCurrentRepository() # Add LASTCHANGE files which are not tracked by git. files.append('build/util/LASTCHANGE') + files.append('build/util/LASTCHANGE.committime') files.append('skia/ext/skia_commit_hash.h') files.append('gpu/config/gpu_lists_version.h') print 'copying files to ' + third_party_chromium diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 27062fbcf..824c9412b 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 = '69.0.3497.113' -chromium_branch = '3497' +chromium_version = '70.0.3538.78' +chromium_branch = '3538' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |