Index: DEPS |
diff --git a/DEPS b/DEPS |
index ddcb8e67c405b65a585b593cefd1e5f49ca9f6ca..a4438f9c8df0be6670d99de729ddeebfe577cd95 100644 |
--- a/DEPS |
+++ b/DEPS |
@@ -3,7 +3,7 @@ use_relative_paths = True |
# Dependencies on outside packages. |
# |
deps = { |
- "common": "https://skia.googlesource.com/common.git@767bf85299d7a822796b57252e7de1e84e6b2e61", |
+ "common": "https://skia.googlesource.com/common.git@0ad95c13aaab3bbb89a97952b83c915d470681df", |
# DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199 |
# (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279) |
@@ -17,14 +17,19 @@ deps = { |
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39", |
# "third_party/externals/v8" : "git://github.com/v8/v8.git@d15b0f0f2099dbd72867f3df70e9aaf5b8afbd2c", |
"third_party/externals/nanomsg": "git://github.com/nanomsg/nanomsg.git@0.4-beta", |
+} |
- # TODO(epoger): These dependencies are needed specifically for google-api-python-client (see http://skbug.com/2641 ). |
- # Once we get them working, we will want to move them all into the "common" repo |
- # (see http://skbug.com/2682 and https://codereview.chromium.org/377323002/ ) |
- "third_party/externals/google-api-python-client" : "https://github.com/google/google-api-python-client.git@ecc64a0a2baa4a77f35dec83ad05c6c9ba2d2841", |
- "third_party/externals/httplib2" : "https://github.com/jcgregorio/httplib2.git@7d1b88a3cf34774242bf4c0578c09c0092bb05d8", |
- "third_party/externals/oauth2client" : "https://github.com/google/oauth2client.git@d02b317af0313dcf66755844f5421651af5eb356", |
- "third_party/externals/uritemplate-py" : "https://github.com/uri-templates/uritemplate-py.git@1e780a49412cdbb273e9421974cb91845c124f3f", |
+# Which of the above should have their dependencies imported, recursively. |
+# |
+# TODO(epoger): I don't know why the label I use here has to have the "skia/" |
epoger
2014/07/10 21:56:20
Robbie: Any idea why this is the case? (I see tha
iannucci
2014/07/10 22:01:42
I suspect that `use_relative_paths` is not respect
|
+# prepended to it, but that's the only way it works (at least when I run |
+# "gclient sync" from the same directory containing the DEPS file; maybe it |
+# performs differently when run one level up where my .gclient file is?) |
+# |
+# Without the "skia/" prepended, it fails silently. I wish gclient reported |
+# an error in that case ("unknown label XXX in recursedeps"). |
+recursedeps = { |
+ "skia/common", |
} |
deps_os = { |