diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-09 17:04:10 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:26:29 +0200 |
| commit | 0a01998411de6a46af8d0b0ae13b8f401cd14a4b (patch) | |
| tree | 7c27c908723628b70b21bfb52428c72acf050a71 /tools | |
| parent | 3c34f95ad4a96737f66ab4933edb9e00abecdc24 (diff) | |
Adaptations for Chromium 74
Change-Id: Icdefa05eec39c632328dfc40862e5b734170bf3f
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/init-repository.py | 2 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 2 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py index 51de479d4..221f74a65 100755 --- a/tools/scripts/init-repository.py +++ b/tools/scripts/init-repository.py @@ -110,7 +110,7 @@ def initUpstreamSubmodules(): gnSubmodule = GitSubmodule.Submodule() gnSubmodule.path = 'src/3rdparty_upstream/gn' - gnSubmodule.ref = 'origin/master' + gnSubmodule.ref = 'master' gnSubmodule.url = gn_url gnSubmodule.os = 'all' gnSubmodule.initialize() diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index c6de5977d..982cab622 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -175,6 +175,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/fuschsia-sdk/') or file_path.startswith('third_party/glslang/src/Test/') or file_path.startswith('third_party/google_') + or file_path.startswith('third_party/grpc/') or file_path.startswith('third_party/hunspell_dictionaries') or (file_path.startswith('third_party/icu') and file_path.endswith('icudtl_dat.S')) or file_path.startswith('third_party/icu/android') @@ -243,6 +244,7 @@ def isInChromiumBlacklist(file_path): not file_path.endswith('mock_chrome_application_mac.h') and not file_path.endswith('perftimer.h') and not file_path.endswith('test-torque.tq') and + not file_path.endswith('fonts.conf') and not 'ozone' in file_path and not 'clang_coverage' in file_path and not 'crypto/test/trampoline' in file_path and diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 450671fa5..2ccb55d83 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 = '73.0.3683.105' -chromium_branch = '3683' +chromium_version = '74.0.3729.159' +chromium_branch = '3729' ninja_version = 'v1.9.0' json_url = 'http://omahaproxy.appspot.com/all.json' |