summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/DEPS
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/chromium/DEPS')
-rw-r--r--WebKit/chromium/DEPS23
1 files changed, 14 insertions, 9 deletions
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index fc90187..9c45b83 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -35,21 +35,22 @@ vars = {
'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
# Dependencies' revisions to use:
- 'chromium_rev': '31834',
- 'google-url_rev': '120',
- 'gtest_rev': '336',
- 'gyp_rev': '751',
- 'icu_rev': '31724',
+ 'chromium_rev': '38580',
+ 'google-url_rev': '121',
+ 'gtest_rev': '359',
+ 'gyp_rev': '781',
+ 'icu_rev': '37341',
'openvcdiff_rev': '28',
- 'ots_rev': '19',
- 'skia_rev': '424',
- 'v8_rev': '3276',
+ 'ots_rev': '26',
+ 'skia_rev': '490',
+ 'v8_rev': '3781',
# Windows:
'cygwin_rev': '11984',
- 'ffmpeg_ia32_rev': '30374',
+ 'ffmpeg_ia32_rev': '34297',
'pthreads-win32_rev': '26716',
'python_24_rev': '22967',
+ 'nss_rev': '36871',
}
deps = {
@@ -142,6 +143,10 @@ deps_os = {
'third_party/pthreads-win32':
Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'),
+
+ # base.gypi depends on nss on Windows
+ 'third_party/nss':
+ Var('chromium_deps_svn')+'/nss@'+Var('nss_rev'),
},
'unix': {
# Linux, actually.