summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 16:25:06 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-06-14 12:41:26 +0000
commit917f862ebfd0a1797786c7c663acb83ff9144cde (patch)
tree0da1e7fe38e7bea037394dca84d300d0abe21318 /tools
parentfa19227c3ac7df7c0d2f8a548a9a36ac9a7b803c (diff)
Adaptations for Chromium 57
Change-Id: Ia2756c1e9b13839c2330bd98cf953d47cbdac0dd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/take_snapshot.py5
-rw-r--r--tools/scripts/version_resolver.py4
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 7af70bf22..3cc1af618 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -113,6 +113,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('chrome_frame')
or file_path.startswith('chromecast')
or file_path.startswith('chromeos')
+ or file_path.startswith('cloud_print')
or file_path.startswith('components/chrome_apps/')
or file_path.startswith('components/cronet/')
or file_path.startswith('components/drive/')
@@ -144,6 +145,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('testing/buildbot')
or file_path.startswith('third_party/WebKit/LayoutTests')
or file_path.startswith('third_party/WebKit/ManualTests')
+ or file_path.startswith('third_party/WebKit/Source/devtools/devtools-node-modules')
or file_path.startswith('third_party/WebKit/PerformanceTests')
or file_path.startswith('third_party/accessibility-audit')
or file_path.startswith('third_party/android_')
@@ -168,6 +170,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/google_input_tools')
or file_path.startswith('third_party/gperf')
or file_path.startswith('third_party/gnu_binutils')
+ or file_path.startswith('third_party/grpc')
or file_path.startswith('third_party/gtk+')
or file_path.startswith('third_party/google_appengine_cloudstorage')
or file_path.startswith('third_party/google_toolbox_for_mac')
@@ -183,6 +186,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/libc++')
or file_path.startswith('third_party/liblouis')
or file_path.startswith('third_party/lighttpd')
+ or file_path.startswith('third_party/libwebm/source/webm_parser/fuzzing')
or file_path.startswith('third_party/logilab')
or file_path.startswith('third_party/markdown')
or file_path.startswith('third_party/mingw-w64')
@@ -198,6 +202,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/pylint')
or file_path.startswith('third_party/scons-2.0.1')
or file_path.startswith('third_party/sfntly/src/cpp/data/fonts')
+ or file_path.startswith('third_party/skia/infra')
or file_path.startswith('third_party/speech-dispatcher')
or file_path.startswith('third_party/talloc')
or file_path.startswith('third_party/trace-viewer')
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 4c0b03a97..2cb60d695 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 = '56.0.2924.122'
-chromium_branch = '2924'
+chromium_version = '57.0.2987.144'
+chromium_branch = '2987'
ninja_version = 'v1.7.2'
json_url = 'http://omahaproxy.appspot.com/all.json'