summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 14:17:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-10 10:26:38 +0200
commit9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch)
tree4eca639f54719a8824a527ee6a40fb13b462b110 /tools
parent0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff)
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/take_snapshot.py3
-rw-r--r--tools/scripts/version_resolver.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 982cab622..3f21dda9c 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -167,7 +167,6 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/catapult/tracing/test_data/')
or file_path.startswith('third_party/chromevox')
or file_path.startswith('third_party/chromite')
- or file_path.startswith('third_party/cld_3')
or file_path.startswith('third_party/closure_compiler')
or file_path.startswith('third_party/colorama')
or file_path.startswith('third_party/depot_tools')
@@ -202,6 +201,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/pylint')
or file_path.startswith('third_party/sfntly/src/cpp/data/fonts')
or file_path.startswith('third_party/sfntly/src/java')
+ or file_path.startswith('third_party/skia/docs/')
or file_path.startswith('third_party/skia/infra')
or file_path.startswith('third_party/sqlite/sqlite-src-')
or file_path.startswith('third_party/speech-dispatcher')
@@ -233,6 +233,7 @@ def isInChromiumBlacklist(file_path):
or ('/fuzz' in file_path and (
'/fuzz/' in file_path
or '/fuzzer/' in file_path
+ or '/fuzzers/' in file_path
or '/fuzzing/' in file_path
))
or ('/test' in file_path and (
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 2ccb55d83..532da34e3 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 = '74.0.3729.159'
-chromium_branch = '3729'
+chromium_version = '75.0.3770.56'
+chromium_branch = '3770'
ninja_version = 'v1.9.0'
json_url = 'http://omahaproxy.appspot.com/all.json'