diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-22 14:18:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-13 16:11:59 +0100 |
| commit | 7869ec5823da36a3ce33b379d3d664204756cad5 (patch) | |
| tree | 45b692a4ed986b0a8932f2f6a183ed9408439e33 /tools | |
| parent | ffb13e6927ae14a7185bb45ee0dfd03973e5ebb0 (diff) | |
Adaptations for Chromium 86
Change-Id: I7e0ebecdbb68cfff0b574c966f3fa80d28680e1c
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/scripts/git_submodule.py | 5 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 1 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index edaed1ed2..43a652b11 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -47,6 +47,7 @@ class DEPSParser: def __init__(self): self.global_scope = { 'Var': lambda var_name: '{%s}' % var_name, + 'Str': str, 'deps_os': {}, } self.local_scope = {} @@ -229,8 +230,8 @@ class Submodule: # supermodule. if self.topmost_supermodule_path_prefix: if not os.path.isdir(self.path): - print '-- skipping ' + self.path + ' as dir has been stripped. --' - return + print '-- creating ' + self.path + ' as dir is missing. --' + os.makedirs(self.path) os.chdir(self.topmost_supermodule_path_prefix) if os.path.isdir(self.path): diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 11a04720a..7f1ae2b2b 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -141,6 +141,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/android_') or file_path.startswith('third_party/angle/third_party/deqp') or file_path.startswith('third_party/angle/third_party/glmark2') + or file_path.startswith('third_party/angle/third_party/VK-GL-CTS') or file_path.startswith('third_party/angle/third_party/vulkan-validation-layers') or file_path.startswith('third_party/apache-') or file_path.startswith('third_party/arcode-android-sdk') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 7d0973bf0..a8ea07786 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 = '85.0.4183.140' -chromium_branch = '4183' +chromium_version = '86.0.4240.124' +chromium_branch = '4240' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' @@ -89,8 +89,6 @@ def readSubmodules(): submodule_dict[sub.path] = sub extradeps_dirs = parser.get_recursedeps() - # Add buildtools submodules - extradeps_dirs.append('buildtools') for extradeps_dir in extradeps_dirs: if extradeps_dir.startswith('src/'): |