summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-19 12:37:02 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-01-25 14:41:06 +0000
commitf4a8ce98bd371acf1ca1eb2c58a8403e8795a670 (patch)
tree1f2305261b605aae31e5f8737ffcb275986baf1e /tools
parent448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (diff)
Adaptations for Chromium 63
Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/take_snapshot.py8
-rw-r--r--tools/scripts/version_resolver.py4
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 4abc23009..69e22d5a6 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -92,6 +92,7 @@ def isInChromiumBlacklist(file_path):
not 'third_party/chromevox' in file_path and
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/devtools/' in file_path and
not '/browser/ui/webui/' in file_path and
not 'common/chrome_constants.' in file_path and
@@ -143,6 +144,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('native_client')
or file_path.startswith('net/android/java')
or (file_path.startswith('net/data/') and '_unittest/' in file_path)
+ or file_path.startswith('net/data/fuzzer_data/')
or file_path.startswith('remoting')
or file_path.startswith('rlz')
or file_path.startswith('testing/android')
@@ -160,10 +162,11 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/ashmem')
or file_path.startswith('third_party/binutils')
or file_path.startswith('third_party/bison')
- or (file_path.startswith('third_party/cacheinvalidation') and
- not file_path.endswith('isolate'))
+ or file_path.startswith('third_party/breakpad')
or file_path.startswith('third_party/boringssl/crypto_test_data.cc')
or file_path.startswith('third_party/boringssl/src/fuzz')
+ or (file_path.startswith('third_party/cacheinvalidation') and
+ not file_path.endswith('isolate'))
or file_path.startswith('third_party/catapult')
or file_path.startswith('third_party/chromite')
or file_path.startswith('third_party/cld_2')
@@ -221,6 +224,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/trace-viewer')
or file_path.startswith('third_party/undoview')
or file_path.startswith('third_party/webgl')
+ or file_path.startswith('third_party/webrtc/resources/')
or file_path.startswith('tools/android')
or file_path.startswith('tools/luci_go')
or file_path.startswith('tools/metrics')
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 597682fda..7a22765ef 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 = '62.0.3202.101'
-chromium_branch = '3202'
+chromium_version = '63.0.3239.117'
+chromium_branch = '3239'
ninja_version = 'v1.8.2'
json_url = 'http://omahaproxy.appspot.com/all.json'