re-land r195325 and use a full Blink checkout
This patch re-lands r195325 and forces Subversion checkouts to
fetch a full Blink checkout instead of selected subdirs. This
will no longer be easily overridable via custom gyp settings.
We need to make this change in order to get the correct top-level
WebKit dir (we're hitting various bugs and failures since we don't
have that dir checked out), and in the hopes that it may eliminate
various svn issues we are seeing on the bots, and in order to generally
simplify things. This will have the downside of making some svn users'
checkouts larger; we have plans to address this problem for both svn
users and git users down the road.
[email protected]
BUG=229611
Review URL: https://codereview.chromium.org/13842028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197534 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index 5116df5..c8981a1 100644
--- a/DEPS
+++ b/DEPS
@@ -78,12 +78,8 @@
"src/third_party/trace-viewer":
(Var("googlecode_url") % "trace-viewer") + "/trunk@255",
- # Note that this is *not* where we check out WebKit -- this just
- # puts some extra files into place for the real WebKit checkout to
- # happen. See lines mentioning "webkit_revision" for the real
- # WebKit checkout.
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@76115",
+ Var("webkit_trunk") + "@" + Var("webkit_revision"),
"src/third_party/icu":
"/trunk/deps/third_party/icu46@192960",
@@ -145,18 +141,6 @@
"src/third_party/skia/include":
(Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
- "src/third_party/WebKit/LayoutTests":
- Var("webkit_trunk") + "/LayoutTests@" + 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"),
-
- "src/third_party/WebKit/Tools/Scripts":
- Var("webkit_trunk") + "/Tools/Scripts@" + Var("webkit_revision"),
-
"src/third_party/ots":
(Var("googlecode_url") % "ots") + "/trunk@97",
@@ -186,6 +170,9 @@
# We run these layout tests as UI tests. Since many of the buildbots that
# run layout tests do NOT have access to the LayoutTest directory, we need
# to map them here. In practice, these do not take up much space.
+ #
+ # TODO: crbug.com/230215. Remove these and update the tests to pull directly
+ # from the Blink repo since the layout tests are now always checked out.
"src/content/test/data/layout_tests/LayoutTests/fast/events":
Var("webkit_trunk") + "/LayoutTests/fast/events@" +
Var("webkit_revision"),
@@ -474,10 +461,6 @@
"src/third_party/webpagereplay": None,
"src/third_party/webrtc": None,
"src/third_party/WebKit": None,
- "src/third_party/WebKit/LayoutTests": None,
- "src/third_party/WebKit/Source": None,
- "src/third_party/WebKit/Tools/DumpRenderTree": None,
- "src/third_party/WebKit/Tools/Scripts": None,
"src/third_party/yasm/source/patched-yasm": None,
"src/tools/page_cycler/acid3": None,
"src/v8": None,
@@ -522,9 +505,6 @@
"src/third_party/openssl":
"/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
- "src/third_party/WebKit/Tools/gdb":
- Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"),
-
"src/third_party/gold":
"/trunk/deps/third_party/gold@168091",
