summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-06 09:16:15 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-01-13 16:12:06 +0100
commitc9d902ca6ca3b1aa2e2762329d18c226d26520af (patch)
tree199fdd7b3f0d0ad21597fafa086729dc2e75d4e1 /tools
parent7869ec5823da36a3ce33b379d3d664204756cad5 (diff)
Adaptations for Chromium 87
Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/take_snapshot.py1
-rw-r--r--tools/scripts/version_resolver.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 7f1ae2b2b..c8cad2ef3 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -220,6 +220,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('ui/file_manager')
or file_path.startswith('ui/gfx/chromeos')
))
+ or '/android/java/' in file_path
or ('/fuzz' in file_path
and ('/fuzz/' in file_path
or '/fuzzer/' in file_path
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index a8ea07786..d7c169590 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 = '86.0.4240.124'
-chromium_branch = '4240'
+chromium_version = '87.0.4280.89'
+chromium_branch = '4280'
ninja_version = 'v1.8.2'
json_url = 'http://omahaproxy.appspot.com/all.json'