diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-23 18:26:28 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:19 +0000 |
commit | c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 (patch) | |
tree | d0bdc1f0ef144bb63ed75b8e6fcfb6f039628210 /tools | |
parent | 1e89fa4226be870d97d3b21c6c7087886c81bbc5 (diff) |
Adaptations for Chromium 68
Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu>
Change-Id: I805246b6f01cb151fff48588744408c676d87c14
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/scripts/take_snapshot.py | 5 | ||||
-rw-r--r-- | tools/scripts/version_resolver.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 6cb55e5c4..0373f391b 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -70,6 +70,7 @@ def isInChromiumBlacklist(file_path): not file_path.startswith('net/test/') and 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 'ozone' in file_path and not 'core/mojo/test/' in file_path and not file_path.startswith('extensions/browser/')) @@ -165,6 +166,7 @@ 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/blink/perf_tests/') or file_path.startswith('third_party/breakpad/src/processor/testdata/') or file_path.startswith('third_party/boringssl/crypto_test_data.cc') or file_path.startswith('third_party/boringssl/src/fuzz') @@ -229,6 +231,8 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/wayland/src') or file_path.startswith('third_party/webgl') or file_path.startswith('third_party/webrtc/resources/') + or file_path.startswith('third_party/webrtc/third_party/boringssl/crypto_test_data.cc') + or file_path.startswith('third_party/webrtc/third_party/boringssl/src/fuzz') or file_path.startswith('tools/android') or file_path.startswith('tools/luci_go') or file_path.startswith('tools/memory_inspector') @@ -242,7 +246,6 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('ui/events/ozone/chromeos') or file_path.startswith('ui/file_manager') or file_path.startswith('ui/gfx/chromeos') - or file_path.startswith('v8/third_party/antlr4') ): return True diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 748205d51..22f2797ad 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 = '67.0.3396.76' -chromium_branch = '3396' +chromium_version = '68.0.3440.125' +chromium_branch = '3440' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |