From 6446152e559b162bd3b69d1dcbb9dc834cc52875 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 12 Sep 2017 15:02:39 +0200
Subject: [PATCH] Update 3rdparty
Updates Chromium to 60.0.3112.116 and Ninja to 1.8.2
Change-Id: I46f6fe4083f338890ad85437404a442aa7eeba81
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/3rdparty | 2 +-
tools/scripts/take_snapshot.py | 7 +++++--
tools/scripts/version_resolver.py | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index 35c0fec5a..0f35665be 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 35c0fec5a9daf7d15dab962660e5dc75f5345f7c
+Subproject commit 0f35665bef3fc26a423ee7770356749c9a6d7dc9
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 2bd1ac5ed..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
@@ -125,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/')
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 96faa5524..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 = '60.0.3112.78'
+chromium_version = '60.0.3112.116'
chromium_branch = '3112'
-ninja_version = 'v1.7.2'
+ninja_version = 'v1.8.2'
json_url = 'http://omahaproxy.appspot.com/all.json'
--
GitLab