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

Side by Side Diff: DEPS

Issue 7718016: Revert 97943 - Switching NaCl IRT to be built inside the chrome build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/download_nacl_irt.py » ('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": "93556", 7 "webkit_revision": "93556",
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 # These hashes need to be updated when nacl_revision is changed.
11 # After changing nacl_revision, run 'gclient runhooks' to get the new values.
12 "nacl_irt_hash_x86_32": "3da71eefa07c815a1aed9dc3a379fc41efda4b6b",
13 "nacl_irt_hash_x86_64": "147077c09e87ff2db20d32af2054bfb4de343c20",
10 "nacl_revision": "6499", 14 "nacl_revision": "6499",
11 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS 15 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
12 # to update other nacl_*_revision's. 16 # to update other nacl_*_revision's.
13 # TODO(brettw) We should use the "From" syntax to avoid hardcoding the 17 # TODO(brettw) We should use the "From" syntax to avoid hardcoding the
14 # revisions here, but it makes checkdeps confused. We should fix checkdeps. 18 # revisions here, but it makes checkdeps confused. We should fix checkdeps.
15 "nacl_chrome_ppapi_revision": "97134", # native_client/DEPS: chrome_ppapi_rev 19 "nacl_chrome_ppapi_revision": "97134", # native_client/DEPS: chrome_ppapi_rev
16 "nacl_tools_revision": "5360", # native_client/DEPS: tools_rev 20 "nacl_tools_revision": "5360", # native_client/DEPS: tools_rev
17 21
18 # These hashes need to be updated when nacl_toolchain_revision is changed. 22 # These hashes need to be updated when nacl_toolchain_revision is changed.
19 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the 23 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
20 # new values. 24 # new values.
21 "nacl_toolchain_mac_x86_newlib_hash": 25 "nacl_toolchain_mac_x86_newlib_hash":
22 "1b0855435c03c435a011c6105a509624b2a4edaa", 26 "be4cc2baf6eb34c8fe155a1bb61e2acd8ca1e924",
23 "nacl_toolchain_win_x86_newlib_hash": 27 "nacl_toolchain_win_x86_newlib_hash":
24 "5038a47b5a9a49acdc36cbe311aec7bce575c164", 28 "56667d7f653b1005cd5116de3d8e9faf346053cf",
25 "nacl_toolchain_linux_x86_newlib_hash": 29 "nacl_toolchain_linux_x86_newlib_hash":
26 "01e245dc6dca16bea5cf840dbc77e3aa138f234f", 30 "5e4876a1fa53c7701cdbeef969a99b3ff0b0ddc5",
27 "nacl_toolchain_revision": "6494", 31 "nacl_toolchain_revision": "6429",
28 32
29 "libjingle_revision": "77", 33 "libjingle_revision": "77",
30 "libvpx_revision": "97420", 34 "libvpx_revision": "97420",
31 "ffmpeg_revision": "97428", 35 "ffmpeg_revision": "97428",
32 "sfntly_revision": "54", 36 "sfntly_revision": "54",
33 "skia_revision": "2142", 37 "skia_revision": "2142",
34 "v8_revision": "8982", 38 "v8_revision": "8982",
35 "webrtc_revision": "242", 39 "webrtc_revision": "242",
36 40
37 # Note: On most bots, clang is not checked out via DEPS but by 41 # Note: On most bots, clang is not checked out via DEPS but by
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 "sdch", 403 "sdch",
400 "skia", 404 "skia",
401 "testing", 405 "testing",
402 "third_party", 406 "third_party",
403 "v8", 407 "v8",
404 ] 408 ]
405 409
406 410
407 hooks = [ 411 hooks = [
408 { 412 {
413 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
414 "pattern": ".",
415 "action": ["python", "src/build/gyp_chromium"],
416 },
417 {
418 # This downloads binaries for Native Client's integrated runtime (IRT)
419 # library, which is built as NaCl untrusted code.
420 "pattern": ".",
421 "action": ["python", "src/build/download_nacl_irt.py",
422 "--nacl_revision", Var("nacl_revision"),
423 "--file_hash", "x86_32", Var("nacl_irt_hash_x86_32"),
424 "--file_hash", "x86_64", Var("nacl_irt_hash_x86_64")],
425 },
426 {
409 # This downloads binaries for Native Client's newlib toolchain. 427 # This downloads binaries for Native Client's newlib toolchain.
410 # Done in lieu of building the toolchain from scratch as it can take 428 # Done in lieu of building the toolchain from scratch as it can take
411 # anywhere from 30 minutes to 4 hours depending on platform to build. 429 # anywhere from 30 minutes to 4 hours depending on platform to build.
412 "pattern": ".", 430 "pattern": ".",
413 "action": [ 431 "action": [
414 "python", "src/build/download_nacl_toolchains.py", 432 "python", "src/build/download_nacl_toolchains.py",
415 "--x86-version", Var("nacl_toolchain_revision"), 433 "--x86-version", Var("nacl_toolchain_revision"),
416 "--nacl-newlib-only", 434 "--nacl-newlib-only",
417 "--file-hash", "mac_x86_newlib", 435 "--file-hash", "mac_x86_newlib",
418 Var("nacl_toolchain_mac_x86_newlib_hash"), 436 Var("nacl_toolchain_mac_x86_newlib_hash"),
419 "--file-hash", "win_x86_newlib", 437 "--file-hash", "win_x86_newlib",
420 Var("nacl_toolchain_win_x86_newlib_hash"), 438 Var("nacl_toolchain_win_x86_newlib_hash"),
421 "--file-hash", "linux_x86_newlib", 439 "--file-hash", "linux_x86_newlib",
422 Var("nacl_toolchain_linux_x86_newlib_hash"), 440 Var("nacl_toolchain_linux_x86_newlib_hash"),
423 ], 441 ],
424 }, 442 },
425 {
426 # A change to a .gyp, .gypi, or to GYP itself should run the generator.
427 "pattern": ".",
428 "action": ["python", "src/build/gyp_chromium"],
429 },
430 ] 443 ]
OLDNEW
« no previous file with comments | « no previous file | build/download_nacl_irt.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698