summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/DEPS
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/chromium/DEPS')
-rw-r--r--WebKit/chromium/DEPS15
1 files changed, 10 insertions, 5 deletions
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index ad0ad75..32c01f0 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '67811'
+ 'chromium_rev': '67532'
}
deps = {
@@ -109,20 +109,20 @@ deps = {
Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
# other third party
+ 'third_party':
+ Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
'third_party/icu':
From('chromium_deps', 'src/third_party/icu'),
'third_party/ots':
From('chromium_deps', 'src/third_party/ots'),
- 'third_party/yasm/source/patched-yasm':
- From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
- 'third_party':
- Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
}
deps_os = {
'win': {
'third_party/cygwin':
From('chromium_deps', 'src/third_party/cygwin'),
+ 'third_party/python_24':
+ From('chromium_deps', 'src/third_party/python_24'),
'third_party/ffmpeg/binaries/chromium/win/ia32':
From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
'third_party/lighttpd':
@@ -131,6 +131,9 @@ deps_os = {
From('chromium_deps', 'src/third_party/nss'),
},
'mac': {
+ # needed by ffmpeg
+ 'third_party/yasm/source/patched-yasm':
+ From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
'third_party/nss':
From('chromium_deps', 'src/third_party/nss'),
},
@@ -138,6 +141,8 @@ deps_os = {
# Linux, actually.
'tools/xdisplaycheck':
Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
+ 'third_party/yasm/source/patched-yasm':
+ From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
'third_party/openssl':
From('chromium_deps', 'src/third_party/openssl'),
},