Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: DEPS

Issue 385783002: roll "common" DEPS, and replace tools/pyutils with it (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix pylint complaints Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 use_relative_paths = True 1 use_relative_paths = True
2 2
3 # Dependencies on outside packages. 3 # Dependencies on outside packages.
4 # 4 #
5 deps = { 5 deps = {
6 "common": "https://skia.googlesource.com/common.git@767bf85299d7a822796b57252e 7de1e84e6b2e61", 6 "common": "https://skia.googlesource.com/common.git@0ad95c13aaab3bbb89a97952b8 3c915d470681df",
7 7
8 # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205 199 8 # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205 199
9 # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bf a859669053859857af1d279) 9 # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bf a859669053859857af1d279)
10 "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angl e.git", 10 "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angl e.git",
11 "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/ freetype2.git@VER-2-5-0-1", 11 "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/ freetype2.git@VER-2-5-0-1",
12 "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp. git@3917682a16d5c19ff3576a8be0ffdb3a332954b1", 12 "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp. git@3917682a16d5c19ff3576a8be0ffdb3a332954b1",
13 "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/ deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3", 13 "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/ deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3",
14 "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/ jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b", 14 "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/ jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b",
15 # Move to a webp version newer than 0.3.0 to pickup NEON fix for iOS 15 # Move to a webp version newer than 0.3.0 to pickup NEON fix for iOS
16 "third_party/externals/jsoncpp-chromium" : "https://chromium.googlesource.com/ chromium/src/third_party/jsoncpp.git@41239939c0c60481f34887d52c038facf05f5533", 16 "third_party/externals/jsoncpp-chromium" : "https://chromium.googlesource.com/ chromium/src/third_party/jsoncpp.git@41239939c0c60481f34887d52c038facf05f5533",
17 "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libw ebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39", 17 "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libw ebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39",
18 # "third_party/externals/v8" : "git://github.com/v8/v8.git@d15b0f0f2099dbd7286 7f3df70e9aaf5b8afbd2c", 18 # "third_party/externals/v8" : "git://github.com/v8/v8.git@d15b0f0f2099dbd7286 7f3df70e9aaf5b8afbd2c",
19 "third_party/externals/nanomsg": "git://github.com/nanomsg/nanomsg.git@0.4-bet a", 19 "third_party/externals/nanomsg": "git://github.com/nanomsg/nanomsg.git@0.4-bet a",
20 }
20 21
21 # TODO(epoger): These dependencies are needed specifically for google-api-pyth on-client (see http://skbug.com/2641 ). 22 # Which of the above should have their dependencies imported, recursively.
22 # Once we get them working, we will want to move them all into the "common" re po 23 #
23 # (see http://skbug.com/2682 and https://codereview.chromium.org/377323002/ ) 24 # 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
24 "third_party/externals/google-api-python-client" : "https://github.com/google/ google-api-python-client.git@ecc64a0a2baa4a77f35dec83ad05c6c9ba2d2841", 25 # prepended to it, but that's the only way it works (at least when I run
25 "third_party/externals/httplib2" : "https://github.com/jcgregorio/httplib2.git @7d1b88a3cf34774242bf4c0578c09c0092bb05d8", 26 # "gclient sync" from the same directory containing the DEPS file; maybe it
26 "third_party/externals/oauth2client" : "https://github.com/google/oauth2client .git@d02b317af0313dcf66755844f5421651af5eb356", 27 # performs differently when run one level up where my .gclient file is?)
27 "third_party/externals/uritemplate-py" : "https://github.com/uri-templates/uri template-py.git@1e780a49412cdbb273e9421974cb91845c124f3f", 28 #
29 # Without the "skia/" prepended, it fails silently. I wish gclient reported
30 # an error in that case ("unknown label XXX in recursedeps").
31 recursedeps = {
32 "skia/common",
28 } 33 }
29 34
30 deps_os = { 35 deps_os = {
31 "android": { 36 "android": {
32 "platform_tools/android/third_party/externals/expat" : "https://android.goog lesource.com/platform/external/expat.git@android-4.2.2_r1.2", 37 "platform_tools/android/third_party/externals/expat" : "https://android.goog lesource.com/platform/external/expat.git@android-4.2.2_r1.2",
33 "platform_tools/android/third_party/externals/gif" : "https://android.google source.com/platform/external/giflib.git@android-4.2.2_r1.2", 38 "platform_tools/android/third_party/externals/gif" : "https://android.google source.com/platform/external/giflib.git@android-4.2.2_r1.2",
34 "platform_tools/android/third_party/externals/png" : "https://android.google source.com/platform/external/libpng.git@android-4.2.2_r1.2", 39 "platform_tools/android/third_party/externals/png" : "https://android.google source.com/platform/external/libpng.git@android-4.2.2_r1.2",
35 "platform_tools/android/third_party/externals/jpeg" : 40 "platform_tools/android/third_party/externals/jpeg" :
36 "https://android.googlesource.com/platform/external/jpeg.git@746f1f0853ddb d14ab5da6af35cc1fa560453d1e", 41 "https://android.googlesource.com/platform/external/jpeg.git@746f1f0853ddb d14ab5da6af35cc1fa560453d1e",
37 }, 42 },
(...skipping 15 matching lines...) Expand all
53 } 58 }
54 } 59 }
55 60
56 #hooks = [ 61 #hooks = [
57 # { 62 # {
58 # # A change to a .gyp, .gypi, or to GYP itself should run the generator. 63 # # A change to a .gyp, .gypi, or to GYP itself should run the generator.
59 # "pattern": ".", 64 # "pattern": ".",
60 # "action": ["python", "trunk/gyp_skia"], 65 # "action": ["python", "trunk/gyp_skia"],
61 # }, 66 # },
62 #] 67 #]
OLDNEW
« no previous file with comments | « no previous file | gm/rebaseline_server/compare_configs.py » ('j') | gm/rebaseline_server/compare_configs.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698