diff options
| author |  epoger <epoger@google.com> | 2014-07-16 14:45:47 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-16 14:45:48 -0700 |
| commit | 03f3db02c10d82ccbb4e3d3bd12fac689ce91fc6 (patch) | |
| tree | 97910c9ee374f61d40279bfb9937354c5969f2e8 /DEPS | |
| parent | 103ae71cdd6520f3059c3a18545ac18d5d649f91 (diff) | |
roll common DEPS, now using recursedeps
BUG=skia:2618
R=borenet@google.com, cmp@chromium.org
Author: epoger@google.com
Review URL: https://codereview.chromium.org/392353003
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -3,20 +3,7 @@ use_relative_paths = True # Dependencies on outside packages. # deps = { - "common": "https://skia.googlesource.com/common.git@0ad95c13aaab3bbb89a97952b83c915d470681df", - # TODO(epoger): Whenever you update the hash of the "common" repo above, - # update the following transitive dependencies as well... - # (I tried to use From() to import the revision numbers from - # common's DEPS file, but that caused "gclient sync" to block forever.) - # - # Once we fix http://crbug.com/393000 ('Gclient recursedeps feature - # doesn't seem to respect use_relative_paths'), we can import them - # recursively, like so: - # recursedeps = {"common"} - "common/third_party/externals/google-api-python-client" : "https://github.com/google/google-api-python-client.git@ecc64a0a2baa4a77f35dec83ad05c6c9ba2d2841", - "common/third_party/externals/httplib2" : "https://github.com/jcgregorio/httplib2.git@7d1b88a3cf34774242bf4c0578c09c0092bb05d8", - "common/third_party/externals/oauth2client" : "https://github.com/google/oauth2client.git@d02b317af0313dcf66755844f5421651af5eb356", - "common/third_party/externals/uritemplate-py" : "https://github.com/uri-templates/uritemplate-py.git@1e780a49412cdbb273e9421974cb91845c124f3f", + "common": "https://skia.googlesource.com/common.git@ac762a93094a8a45e2793820ababd280766eef2a", # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199 # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279) @@ -32,6 +19,10 @@ deps = { "third_party/externals/nanomsg": "git://github.com/nanomsg/nanomsg.git@0.4-beta", } +recursedeps = [ + "common", +] + deps_os = { "android": { "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-4.2.2_r1.2", |