diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-01 13:15:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-07-01 18:30:51 +0000 |
| commit | 1e204d3b74fbe275fb4d9fe45bbb011742f828f9 (patch) | |
| tree | 1751b7f429c8105e9ea1515d6cdeaa6499de603b | |
| parent | 6015db674f8ef8321bbb030b52d294686caf5bc7 (diff) | |
Update chromium to 51.0.2704.106
Also adds some extensions and components we may need for upcoming
features.
Change-Id: I369915cec296bc96764476981f7ac7bfb4871045
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 12 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject ac04c03fc89dbd789fd575b0cf38e7082fbe81a +Subproject fcf843c48cd15a8c4aa53346948425809e8d7f2 diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index e270a9b60..0644774f8 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -112,8 +112,6 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('components/drive/') or file_path.startswith('components/invalidation/') or file_path.startswith('components/gcm_driver/') - or file_path.startswith('components/google/') - or file_path.startswith('components/metrics/') or file_path.startswith('components/mus/') or file_path.startswith('components/nacl/') or file_path.startswith('components/omnibox/') @@ -125,18 +123,11 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('components/test/') or file_path.startswith('components/test_runner/') or file_path.startswith('components/translate/') - or file_path.startswith('components/variations/') or file_path.startswith('content/public/android/java') or (file_path.startswith('content/shell') and not file_path.startswith('content/shell/common') and not file_path.endswith('.grd')) or file_path.startswith('courgette') - or (file_path.startswith('extensions') and - not 'browser/extension_function_registry.h' in file_path and - not 'browser/extension_function_histogram_value.h' in file_path and - not 'browser/notification_types.' in file_path and - not 'common/constants.' in file_path and - not 'common/url_pattern.' in file_path) or file_path.startswith('google_update') or file_path.startswith('ios') or file_path.startswith('media/base/android/java') @@ -181,7 +172,8 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/jsr-305/src') or file_path.startswith('third_party/junit') or file_path.startswith('third_party/libphonenumber') - or file_path.startswith('third_party/libaddressinput') + or file_path.startswith('third_party/libaddressinput/src/testdata') + or file_path.startswith('third_party/libaddressinput/src/common/src/test') or file_path.startswith('third_party/libc++') or file_path.startswith('third_party/liblouis') or file_path.startswith('third_party/lighttpd') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index e58c647de..b57e3cd51 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,7 +38,7 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '51.0.2704.79' +chromium_version = '51.0.2704.106' chromium_branch = '2704' ninja_version = 'v1.6.0' |