summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/DEPS
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/chromium/DEPS')
-rw-r--r--WebKit/chromium/DEPS27
1 files changed, 17 insertions, 10 deletions
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index c633a79..973e78d 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,9 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '47248',
-
- 'pthreads-win32_rev': '26716',
+ 'chromium_rev': '49521',
}
deps = {
@@ -82,7 +80,7 @@ deps = {
'googleurl':
From('chromium_deps', 'src/googleurl'),
- # webkit dependencis
+ # webkit dependencies
'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'),
'app':
@@ -91,10 +89,18 @@ deps = {
Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
'media':
Var('chromium_svn')+'/media@'+Var('chromium_rev'),
+ 'third_party/angle': # needed by the gpu process
+ From('chromium_deps', 'src/third_party/angle'),
'third_party/glew': # webgl related
Var('chromium_svn')+'/third_party/glew@'+Var('chromium_rev'),
'third_party/ffmpeg': # needed by webkit/media
- Var('chromium_svn')+'/third_party/ffmpeg@'+Var('chromium_rev'),
+ From('chromium_deps', 'src/third_party/ffmpeg'),
+ 'third_party/libvpx/include':
+ From('chromium_deps', 'src/third_party/libvpx/include'),
+ 'third_party/libvpx/lib':
+ From('chromium_deps', 'src/third_party/libvpx/lib'),
+ 'third_party/mesa':
+ Var('chromium_svn')+'/third_party/mesa@'+Var('chromium_rev'),
'third_party/yasm': # needed by ffmpeg
Var('chromium_svn')+'/third_party/yasm@'+Var('chromium_rev'),
'third_party/openmax': # needed by webkit/media
@@ -147,8 +153,8 @@ deps = {
'third_party/zlib':
Var('chromium_svn')+'/third_party/zlib@'+Var('chromium_rev'),
- 'third_party/ffmpeg/source/patched-ffmpeg-mt':
- From('chromium_deps', 'src/third_party/ffmpeg/source/patched-ffmpeg-mt'),
+ 'third_party/mozilla':
+ Var('chromium_svn')+'/third_party/mozilla@'+Var('chromium_rev'),
}
deps_os = {
@@ -159,9 +165,8 @@ deps_os = {
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/pthreads-win32':
- 'http://src.chromium.org/svn/trunk/deps/third_party/pthreads-win32@'+Var('pthreads-win32_rev'),
- # base.gypi depends on nss on Windows
+ 'third_party/lighttpd':
+ From('chromium_deps', 'src/third_party/lighttpd'),
'third_party/nss':
From('chromium_deps', 'src/third_party/nss'),
'third_party/wtl':
@@ -171,6 +176,8 @@ deps_os = {
# 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'),
},
'unix': {
# Linux, actually.