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

Side by Side Diff: trunk/src/DEPS

Issue 272003004: Revert 270272 "Change Skia DEPS to pull from googlesource (git)" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/third_party/skia/LICENSE » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This file is automatically processed to create .DEPS.git which is the file 1 # This file is automatically processed to create .DEPS.git which is the file
2 # that gclient uses under git. 2 # that gclient uses under git.
3 # 3 #
4 # See http://code.google.com/p/chromium/wiki/UsingGit 4 # See http://code.google.com/p/chromium/wiki/UsingGit
5 # 5 #
6 # To test manually, run: 6 # To test manually, run:
7 # python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir> 7 # python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
8 # gclient runhooks 8 # gclient runhooks
9 # where <gcliendir> is the absolute path to the directory containing the 9 # where <gcliendir> is the absolute path to the directory containing the
10 # .gclient file (the parent of "src"). 10 # .gclient file (the parent of "src").
(...skipping 10 matching lines...) Expand all
21 "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", 21 "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
22 "llvm_url": "http://src.chromium.org/llvm-project", 22 "llvm_url": "http://src.chromium.org/llvm-project",
23 "llvm_git": "https://llvm.googlesource.com", 23 "llvm_git": "https://llvm.googlesource.com",
24 "libcxx_revision": "206024", 24 "libcxx_revision": "206024",
25 "libcxxabi_revision": "206024", 25 "libcxxabi_revision": "206024",
26 "webkit_trunk": "http://src.chromium.org/blink/trunk", 26 "webkit_trunk": "http://src.chromium.org/blink/trunk",
27 "nacl_trunk": "http://src.chromium.org/native_client/trunk", 27 "nacl_trunk": "http://src.chromium.org/native_client/trunk",
28 "webkit_revision": "173975", 28 "webkit_revision": "173975",
29 "chromium_git": "https://chromium.googlesource.com", 29 "chromium_git": "https://chromium.googlesource.com",
30 "chromiumos_git": "https://chromium.googlesource.com/chromiumos", 30 "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
31 "skia_git": "https://skia.googlesource.com",
31 "swig_revision": "230490", 32 "swig_revision": "230490",
32 "nacl_revision": "13167", 33 "nacl_revision": "13167",
33 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS 34 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
34 # to update other nacl_*_revision's. 35 # to update other nacl_*_revision's.
35 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev 36 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev
36 "google_toolbox_for_mac_revision": "662", 37 "google_toolbox_for_mac_revision": "662",
37 "libaddressinput_revision": "176", 38 "libaddressinput_revision": "176",
38 "libphonenumber_revision": "621", 39 "libphonenumber_revision": "621",
39 "libvpx_revision": "269083", 40 "libvpx_revision": "269083",
40 "lss_revision": "26", 41 "lss_revision": "26",
41 42
42 # These two FFmpeg variables must be updated together. One is used for SVN 43 # These two FFmpeg variables must be updated together. One is used for SVN
43 # checkouts and the other for Git checkouts. 44 # checkouts and the other for Git checkouts.
44 "ffmpeg_revision": "270146", 45 "ffmpeg_revision": "270146",
45 "ffmpeg_hash": "d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", 46 "ffmpeg_hash": "d3a060bd1d6a4f43e9bc7d07f193b0513df4f244",
46 47
47 "sfntly_revision": "228", 48 "sfntly_revision": "228",
48 "lighttpd_revision": "33737", 49 "lighttpd_revision": "33737",
49 "skia_revision": "eaa674987f99687c0bfa337eaa27f00ffe3faa4b", 50 "skia_revision": "14688",
51 "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa",
50 # Three lines of non-changing comments so that 52 # Three lines of non-changing comments so that
51 # the commit queue can handle CLs rolling Skia 53 # the commit queue can handle CLs rolling Skia
52 # and V8 without interference from each other. 54 # and V8 without interference from each other.
53 "v8_branch": "trunk", 55 "v8_branch": "trunk",
54 "v8_revision": "21152", 56 "v8_revision": "21152",
55 # Three lines of non-changing comments so that 57 # Three lines of non-changing comments so that
56 # the commit queue can handle CLs rolling WebRTC 58 # the commit queue can handle CLs rolling WebRTC
57 # and V8 without interference from each other. 59 # and V8 without interference from each other.
58 "webrtc_revision": "6116", 60 "webrtc_revision": "6116",
59 "jsoncpp_revision": "248", 61 "jsoncpp_revision": "248",
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), 153 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
152 154
153 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": 155 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
154 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + 156 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
155 Var("nacl_revision"), 157 Var("nacl_revision"),
156 158
157 "src/third_party/sfntly/cpp/src": 159 "src/third_party/sfntly/cpp/src":
158 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" + 160 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" +
159 Var("sfntly_revision"), 161 Var("sfntly_revision"),
160 162
161 "src/third_party/skia": 163 "src/third_party/skia/src":
162 Var("chromium_git") + "/skia.git@" + Var("skia_revision"), 164 (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"),
165
166 "src/third_party/skia/gyp":
167 (Var("googlecode_url") % "skia") + "/trunk/gyp@" + Var("skia_revision"),
168
169 "src/third_party/skia/include":
170 (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
163 171
164 "src/third_party/ots": 172 "src/third_party/ots":
165 (Var("googlecode_url") % "ots") + "/trunk@113", 173 (Var("googlecode_url") % "ots") + "/trunk@113",
166 174
167 "src/third_party/brotli/src": 175 "src/third_party/brotli/src":
168 Var("chromium_git") + 176 Var("chromium_git") +
169 "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5f cd8e01", 177 "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5f cd8e01",
170 178
171 "src/tools/page_cycler/acid3": 179 "src/tools/page_cycler/acid3":
172 "/trunk/deps/page_cycler/acid3@171600", 180 "/trunk/deps/page_cycler/acid3@171600",
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 "-s", "src/build/linux/bin/eu-strip.sha1", 757 "-s", "src/build/linux/bin/eu-strip.sha1",
750 ], 758 ],
751 }, 759 },
752 { 760 {
753 # A change to a .gyp, .gypi, or to GYP itself should run the generator. 761 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
754 "name": "gyp", 762 "name": "gyp",
755 "pattern": ".", 763 "pattern": ".",
756 "action": ["python", "src/build/gyp_chromium"], 764 "action": ["python", "src/build/gyp_chromium"],
757 }, 765 },
758 ] 766 ]
OLDNEW
« no previous file with comments | « no previous file | trunk/src/third_party/skia/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698