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

Side by Side Diff: trunk/src/DEPS

Issue 287973002: Revert 270430 "Retry: Change Skia DEPS to pull from googlesource..." (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 # where <gcliendir> is the absolute path to the directory containing the 8 # where <gcliendir> is the absolute path to the directory containing the
9 # .gclient file (the parent of "src"). 9 # .gclient file (the parent of "src").
10 # 10 #
(...skipping 13 matching lines...) Expand all
24 "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", 24 "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
25 "llvm_url": "http://src.chromium.org/llvm-project", 25 "llvm_url": "http://src.chromium.org/llvm-project",
26 "llvm_git": "https://llvm.googlesource.com", 26 "llvm_git": "https://llvm.googlesource.com",
27 "libcxx_revision": "206024", 27 "libcxx_revision": "206024",
28 "libcxxabi_revision": "206024", 28 "libcxxabi_revision": "206024",
29 "webkit_trunk": "http://src.chromium.org/blink/trunk", 29 "webkit_trunk": "http://src.chromium.org/blink/trunk",
30 "nacl_trunk": "http://src.chromium.org/native_client/trunk", 30 "nacl_trunk": "http://src.chromium.org/native_client/trunk",
31 "webkit_revision": "174018", 31 "webkit_revision": "174018",
32 "chromium_git": "https://chromium.googlesource.com", 32 "chromium_git": "https://chromium.googlesource.com",
33 "chromiumos_git": "https://chromium.googlesource.com/chromiumos", 33 "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
34 "skia_git": "https://skia.googlesource.com",
34 "swig_revision": "230490", 35 "swig_revision": "230490",
35 "nacl_revision": "13167", 36 "nacl_revision": "13167",
36 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS 37 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
37 # to update other nacl_*_revision's. 38 # to update other nacl_*_revision's.
38 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev 39 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev
39 "google_toolbox_for_mac_revision": "662", 40 "google_toolbox_for_mac_revision": "662",
40 "libaddressinput_revision": "176", 41 "libaddressinput_revision": "176",
41 "libphonenumber_revision": "621", 42 "libphonenumber_revision": "621",
42 "libvpx_revision": "269083", 43 "libvpx_revision": "269083",
43 "lss_revision": "26", 44 "lss_revision": "26",
44 45
45 # These two FFmpeg variables must be updated together. One is used for SVN 46 # These two FFmpeg variables must be updated together. One is used for SVN
46 # checkouts and the other for Git checkouts. 47 # checkouts and the other for Git checkouts.
47 "ffmpeg_revision": "270146", 48 "ffmpeg_revision": "270146",
48 "ffmpeg_hash": "d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", 49 "ffmpeg_hash": "d3a060bd1d6a4f43e9bc7d07f193b0513df4f244",
49 50
50 "sfntly_revision": "228", 51 "sfntly_revision": "228",
51 "lighttpd_revision": "33737", 52 "lighttpd_revision": "33737",
52 "skia_revision": "eaa674987f99687c0bfa337eaa27f00ffe3faa4b", 53 "skia_revision": "14688",
54 "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa",
53 # Three lines of non-changing comments so that 55 # Three lines of non-changing comments so that
54 # the commit queue can handle CLs rolling Skia 56 # the commit queue can handle CLs rolling Skia
55 # and V8 without interference from each other. 57 # and V8 without interference from each other.
56 "v8_branch": "trunk", 58 "v8_branch": "trunk",
57 "v8_revision": "21291", 59 "v8_revision": "21291",
58 # Three lines of non-changing comments so that 60 # Three lines of non-changing comments so that
59 # the commit queue can handle CLs rolling WebRTC 61 # the commit queue can handle CLs rolling WebRTC
60 # and V8 without interference from each other. 62 # and V8 without interference from each other.
61 "webrtc_revision": "6116", 63 "webrtc_revision": "6116",
62 "jsoncpp_revision": "248", 64 "jsoncpp_revision": "248",
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), 164 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
163 165
164 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": 166 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
165 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + 167 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
166 Var("nacl_revision"), 168 Var("nacl_revision"),
167 169
168 "src/third_party/sfntly/cpp/src": 170 "src/third_party/sfntly/cpp/src":
169 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" + 171 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" +
170 Var("sfntly_revision"), 172 Var("sfntly_revision"),
171 173
172 "src/third_party/skia": 174 "src/third_party/skia/src":
173 Var("chromium_git") + "/skia.git@" + Var("skia_revision"), 175 (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"),
176
177 "src/third_party/skia/gyp":
178 (Var("googlecode_url") % "skia") + "/trunk/gyp@" + Var("skia_revision"),
179
180 "src/third_party/skia/include":
181 (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
174 182
175 "src/third_party/ots": 183 "src/third_party/ots":
176 (Var("googlecode_url") % "ots") + "/trunk@113", 184 (Var("googlecode_url") % "ots") + "/trunk@113",
177 185
178 "src/third_party/brotli/src": 186 "src/third_party/brotli/src":
179 Var("chromium_git") + 187 Var("chromium_git") +
180 "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5f cd8e01", 188 "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5f cd8e01",
181 189
182 "src/tools/page_cycler/acid3": 190 "src/tools/page_cycler/acid3":
183 "/trunk/deps/page_cycler/acid3@171600", 191 "/trunk/deps/page_cycler/acid3@171600",
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 "-s", "src/build/linux/bin/eu-strip.sha1", 768 "-s", "src/build/linux/bin/eu-strip.sha1",
761 ], 769 ],
762 }, 770 },
763 { 771 {
764 # A change to a .gyp, .gypi, or to GYP itself should run the generator. 772 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
765 "name": "gyp", 773 "name": "gyp",
766 "pattern": ".", 774 "pattern": ".",
767 "action": ["python", "src/build/gyp_chromium"], 775 "action": ["python", "src/build/gyp_chromium"],
768 }, 776 },
769 ] 777 ]
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