summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------src/3rdparty0
-rwxr-xr-xtools/scripts/take_snapshot.py1
-rw-r--r--tools/scripts/version_resolver.py2
3 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject e30a64eb8cfd91951e06ed17611f1d9643e8a2d
+Subproject 2279234ce87ac6b0402cb370051a0adeafa25b8
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'