summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 06:50:01 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 06:50:01 +0000
commitc1d9cdcb2aa753686fb29f3c5f42f710acf49782 (patch)
tree9230c8ca02e0607cec3bfeb4ed1c945e4163bc84 /DEPS
parent8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60 (diff)
downloadchromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.zip
chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.tar.gz
chromium_src-c1d9cdcb2aa753686fb29f3c5f42f710acf49782.tar.bz2
Roll WebKit DEPS past WebKit move. Update gyp files and include paths to reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS14
1 files changed, 3 insertions, 11 deletions
diff --git a/DEPS b/DEPS
index 44dcb97..58ff1bf 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "75905",
+ "webkit_revision": "75910",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "4139",
@@ -75,14 +75,8 @@ deps = {
"src/third_party/WebKit/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
- "src/third_party/WebKit/Source/JavaScriptCore":
- Var("webkit_trunk") + "/Source/JavaScriptCore@" + Var("webkit_revision"),
-
- "src/third_party/WebKit/Source/WebCore":
- Var("webkit_trunk") + "/Source/WebCore@" + Var("webkit_revision"),
-
- "src/third_party/WebKit/WebKit/chromium":
- Var("webkit_trunk") + "/WebKit/chromium@" + Var("webkit_revision"),
+ "src/third_party/WebKit/Source":
+ Var("webkit_trunk") + "/Source@" + Var("webkit_revision"),
"src/third_party/WebKit/Tools/DumpRenderTree":
Var("webkit_trunk") + "/Tools/DumpRenderTree@" + Var("webkit_revision"),
@@ -245,8 +239,6 @@ deps_os = {
"src/third_party/lighttpd":
"/trunk/deps/third_party/lighttpd@33737",
- "src/third_party/WebKit/WebKit/mac":
- Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
"src/third_party/WebKit/WebKitLibraries":
Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),