summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/take_snapshot.py12
-rw-r--r--tools/scripts/version_resolver.py6
2 files changed, 13 insertions, 5 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 4a1031e80..0b13072dc 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -71,7 +71,8 @@ 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 'ozone' in file_path)
+ not 'ozone' in file_path and
+ not file_path.startswith('extensions/browser/'))
or file_path.endswith('.java')
or file_path.startswith('android_webview')
or file_path.startswith('apps/')
@@ -91,6 +92,8 @@ 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/devtools/' in file_path and
+ not '/browser/ui/webui/' in file_path and
not 'common/chrome_constants.' in file_path and
not 'common/chrome_paths' in file_path and
not 'common/chrome_switches.' in file_path and
@@ -113,6 +116,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/')
@@ -124,7 +128,7 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('components/proximity_auth/')
or (file_path.startswith('components/resources/terms/') and not file_path.endswith('terms_chromium.html'))
or file_path.startswith('components/rlz/')
- or file_path.startswith('components/sync/')
+ or file_path.startswith('components/sync/') and not file_path.endswith('ordinal.h')
or file_path.startswith('components/test/')
or file_path.startswith('components/test_runner/')
or file_path.startswith('components/translate/')
@@ -144,6 +148,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/afl')
@@ -169,6 +174,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')
@@ -184,6 +190,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')
@@ -199,6 +206,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..f2ff114db 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,9 +38,9 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '56.0.2924.122'
-chromium_branch = '2924'
-ninja_version = 'v1.7.2'
+chromium_version = '60.0.3112.116'
+chromium_branch = '3112'
+ninja_version = 'v1.8.2'
json_url = 'http://omahaproxy.appspot.com/all.json'