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

Side by Side Diff: DEPS

Issue 8243012: Fix build with system yasm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 vars = { 1 vars = {
2 # Use this googlecode_url variable only if there is an internal mirror for it. 2 # Use this googlecode_url variable only if there is an internal mirror for it.
3 # If you do not know, use the full path while defining your new deps entry. 3 # If you do not know, use the full path while defining your new deps entry.
4 "googlecode_url": "http://%s.googlecode.com/svn", 4 "googlecode_url": "http://%s.googlecode.com/svn",
5 "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", 5 "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
6 "nacl_trunk": "http://src.chromium.org/native_client/trunk", 6 "nacl_trunk": "http://src.chromium.org/native_client/trunk",
7 "webkit_revision": "97251", 7 "webkit_revision": "97251",
8 "chromium_git": "http://git.chromium.org/git", 8 "chromium_git": "http://git.chromium.org/git",
9 "swig_revision": "69281", 9 "swig_revision": "69281",
10 "nacl_revision": "6904", 10 "nacl_revision": "6904",
11 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS 11 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
12 # to update other nacl_*_revision's. 12 # to update other nacl_*_revision's.
13 # TODO(brettw) We should use the "From" syntax to avoid hardcoding the 13 # TODO(brettw) We should use the "From" syntax to avoid hardcoding the
14 # revisions here, but it makes checkdeps confused. We should fix checkdeps. 14 # revisions here, but it makes checkdeps confused. We should fix checkdeps.
15 "nacl_tools_revision": "6504", # native_client/DEPS: tools_rev 15 "nacl_tools_revision": "6504", # native_client/DEPS: tools_rev
16 16
17 # These hashes need to be updated when nacl_toolchain_revision is changed. 17 # These hashes need to be updated when nacl_toolchain_revision is changed.
18 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the 18 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
19 # new values. 19 # new values.
20 "nacl_toolchain_mac_x86_newlib_hash": 20 "nacl_toolchain_mac_x86_newlib_hash":
21 "280ecee659ff804d5eeca8964c31545b0d68d9c8", 21 "280ecee659ff804d5eeca8964c31545b0d68d9c8",
22 "nacl_toolchain_win_x86_newlib_hash": 22 "nacl_toolchain_win_x86_newlib_hash":
23 "7730f4515c745c0c012df4a1080be9a46ffcda47", 23 "7730f4515c745c0c012df4a1080be9a46ffcda47",
24 "nacl_toolchain_linux_x86_newlib_hash": 24 "nacl_toolchain_linux_x86_newlib_hash":
25 "596aa5b812ec4b24160ed7ce55b3fd141f929fbf", 25 "596aa5b812ec4b24160ed7ce55b3fd141f929fbf",
26 "nacl_toolchain_revision": "6757", 26 "nacl_toolchain_revision": "6757",
27 27
28 "libjingle_revision": "85", 28 "libjingle_revision": "85",
29 "libvpx_revision": "103347", 29 "libvpx_revision": "105133",
30 "ffmpeg_revision": "103983", 30 "ffmpeg_revision": "105133",
31 "sfntly_revision": "98", 31 "sfntly_revision": "98",
32 "skia_revision": "2460", 32 "skia_revision": "2460",
33 "v8_revision": "9586", 33 "v8_revision": "9586",
34 "webrtc_revision": "711", 34 "webrtc_revision": "711",
35 35
36 # Note: On most bots, clang is not checked out via DEPS but by 36 # Note: On most bots, clang is not checked out via DEPS but by
37 # tools/clang/scripts/update.sh. The script reads this line here. 37 # tools/clang/scripts/update.sh. The script reads this line here.
38 # Do NOT CHANGE this if you don't know what you're doing -- see 38 # Do NOT CHANGE this if you don't know what you're doing -- see
39 # http://code.google.com/p/chromium/wiki/UpdatingClang 39 # http://code.google.com/p/chromium/wiki/UpdatingClang
40 "clang_revision": "140930", 40 "clang_revision": "140930",
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 (Var("googlecode_url") % "libjingle") + "/trunk@" + 250 (Var("googlecode_url") % "libjingle") + "/trunk@" +
251 Var("libjingle_revision"), 251 Var("libjingle_revision"),
252 252
253 "src/third_party/speex": 253 "src/third_party/speex":
254 "/trunk/deps/third_party/speex@83190", 254 "/trunk/deps/third_party/speex@83190",
255 255
256 "src/third_party/yasm/source/patched-yasm": 256 "src/third_party/yasm/source/patched-yasm":
257 "/trunk/deps/third_party/yasm/patched-yasm@73761", 257 "/trunk/deps/third_party/yasm/patched-yasm@73761",
258 258
259 "src/third_party/libjpeg_turbo": 259 "src/third_party/libjpeg_turbo":
260 "/trunk/deps/third_party/libjpeg_turbo@102926", 260 "/trunk/deps/third_party/libjpeg_turbo@105131",
261 261
262 "src/third_party/flac": 262 "src/third_party/flac":
263 "/trunk/deps/third_party/flac@96404", 263 "/trunk/deps/third_party/flac@96404",
264 264
265 "src/third_party/pyftpdlib/src": 265 "src/third_party/pyftpdlib/src":
266 (Var("googlecode_url") % "pyftpdlib") + "/trunk@888", 266 (Var("googlecode_url") % "pyftpdlib") + "/trunk@888",
267 267
268 # Needed to support nacl browser test jig. 268 # Needed to support nacl browser test jig.
269 "src/third_party/pylib": 269 "src/third_party/pylib":
270 # TODO(brettw) enable the From() line instead when checkdeps is fixed. 270 # TODO(brettw) enable the From() line instead when checkdeps is fixed.
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 # which takes ~20s, but clang speeds up builds by more than 20s. 437 # which takes ~20s, but clang speeds up builds by more than 20s.
438 "pattern": ".", 438 "pattern": ".",
439 "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], 439 "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"],
440 }, 440 },
441 { 441 {
442 # A change to a .gyp, .gypi, or to GYP itself should run the generator. 442 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
443 "pattern": ".", 443 "pattern": ".",
444 "action": ["python", "src/build/gyp_chromium"], 444 "action": ["python", "src/build/gyp_chromium"],
445 }, 445 },
446 ] 446 ]
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698