diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-05 11:22:17 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-05 10:30:47 +0000 |
| commit | 1ae9e7cc00a366fddcb4909df375829e9727c7fa (patch) | |
| tree | 6aa2937512344c36961df994784d2e6ef0d72d26 /tools | |
| parent | 1ed88bc02510d2d49548d291a6e38973774e7b35 (diff) | |
Update Chromium to 47.0.2526.109
Also pulls in the CDM component.
Change-Id: Ide70c3f8872b55473d17c32de65046fb3b0ced05
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 1 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 0c8847b9d..ea0c73328 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -115,6 +115,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('chromeos') or file_path.startswith('cloud_print') or (file_path.startswith('components') and + not file_path.startswith('components/cdm') and not file_path.startswith('components/device_event_log') and not file_path.startswith('components/devtools_') and not file_path.startswith('components/error_page') and diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index c681aa1d9..c63e3e381 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -51,7 +51,7 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '47.0.2526.71' +chromium_version = '47.0.2526.109' chromium_branch = '2526' ninja_version = 'v1.6.0' |