OLD | NEW |
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 "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", | 5 "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", |
6 "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", | 6 "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", |
7 "nacl_trunk": "http://src.chromium.org/native_client/trunk", | 7 "nacl_trunk": "http://src.chromium.org/native_client/trunk", |
8 "webkit_revision": "101114", | 8 "webkit_revision": "101114", |
9 "chromium_git": "http://git.chromium.org/git", | 9 "chromium_git": "http://git.chromium.org/git", |
10 "swig_revision": "69281", | 10 "swig_revision": "69281", |
11 "nacl_revision": "7281", | 11 "nacl_revision": "7169", |
12 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS | 12 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS |
13 # to update other nacl_*_revision's. | 13 # to update other nacl_*_revision's. |
14 "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev | 14 "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev |
15 | 15 |
16 # These hashes need to be updated when nacl_toolchain_revision is changed. | 16 # These hashes need to be updated when nacl_toolchain_revision is changed. |
17 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the | 17 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the |
18 # new values. | 18 # new values. |
19 "nacl_toolchain_linux_x86_hash": | 19 "nacl_toolchain_mac_x86_newlib_hash": |
20 "33afa1cefa7fd2a7270b309298dbbf93361d90db", | 20 "74612a65dd6bae1d85af1f7277cc6af6e5d86b46", |
| 21 "nacl_toolchain_win_x86_newlib_hash": |
| 22 "3672e7b20848beec886badc46909cf24fb1c574f", |
21 "nacl_toolchain_linux_x86_newlib_hash": | 23 "nacl_toolchain_linux_x86_newlib_hash": |
22 "5f82c18ce9d0201f9df852bddcb19746ef690290", | 24 "528b9b85d087ffb5a0f6348f5219a33cd0ff725f", |
23 "nacl_toolchain_mac_x86_hash": | 25 "nacl_toolchain_revision": "7098", |
24 "f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed", | |
25 "nacl_toolchain_mac_x86_newlib_hash": | |
26 "648b5ae8ae770b41c4a0eef28cff6f67fe8bb386", | |
27 "nacl_toolchain_win_x86_hash": | |
28 "75ee1d6f8c758d9580b2c35773b14d0ab6847372", | |
29 "nacl_toolchain_win_x86_newlib_hash": | |
30 "a340bc72900f002f88491bf82baf69d35593ed75", | |
31 "nacl_toolchain_revision": "7258", | |
32 | 26 |
33 "libjingle_revision": "95", | 27 "libjingle_revision": "95", |
34 "libvpx_revision": "109236", | 28 "libvpx_revision": "109236", |
35 "ffmpeg_revision": "109946", | 29 "ffmpeg_revision": "109946", |
36 "sfntly_revision": "98", | 30 "sfntly_revision": "98", |
37 "skia_revision": "2730", | 31 "skia_revision": "2730", |
38 # Three lines of non-changing comments so that | 32 # Three lines of non-changing comments so that |
39 # the commit queue can handle CLs rolling Skia | 33 # the commit queue can handle CLs rolling Skia |
40 # and V8 without interference from each other. | 34 # and V8 without interference from each other. |
41 "v8_revision": "10037", | 35 "v8_revision": "10037", |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 (Var("googlecode_url") % "grit-i18n") + "/trunk@7", | 95 (Var("googlecode_url") % "grit-i18n") + "/trunk@7", |
102 | 96 |
103 "src/tools/gyp": | 97 "src/tools/gyp": |
104 (Var("googlecode_url") % "gyp") + "/trunk@1098", | 98 (Var("googlecode_url") % "gyp") + "/trunk@1098", |
105 | 99 |
106 "src/v8": | 100 "src/v8": |
107 (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), | 101 (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), |
108 | 102 |
109 "src/native_client": | 103 "src/native_client": |
110 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), | 104 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), |
111 | |
112 "src/native_client_sdk/src/site_scons": | |
113 Var("nacl_trunk") + "/src/native_client/site_scons@" + Var("nacl_revision"), | |
114 | |
115 "src/third_party/pymox": | |
116 "http://pymox.googlecode.com/svn/trunk@61", | |
117 | 105 |
118 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": | 106 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": |
119 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + | 107 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + |
120 Var("nacl_revision"), | 108 Var("nacl_revision"), |
121 | 109 |
122 "src/third_party/sfntly/src/sfntly": | 110 "src/third_party/sfntly/src/sfntly": |
123 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" + | 111 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" + |
124 Var("sfntly_revision"), | 112 Var("sfntly_revision"), |
125 | 113 |
126 "src/third_party/skia/src": | 114 "src/third_party/skia/src": |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 | 416 |
429 | 417 |
430 hooks = [ | 418 hooks = [ |
431 { | 419 { |
432 # This downloads binaries for Native Client's newlib toolchain. | 420 # This downloads binaries for Native Client's newlib toolchain. |
433 # Done in lieu of building the toolchain from scratch as it can take | 421 # Done in lieu of building the toolchain from scratch as it can take |
434 # anywhere from 30 minutes to 4 hours depending on platform to build. | 422 # anywhere from 30 minutes to 4 hours depending on platform to build. |
435 "pattern": ".", | 423 "pattern": ".", |
436 "action": [ | 424 "action": [ |
437 "python", "src/build/download_nacl_toolchains.py", | 425 "python", "src/build/download_nacl_toolchains.py", |
438 "--no-pnacl", | |
439 "--no-arm-trusted", | |
440 "--x86-version", Var("nacl_toolchain_revision"), | 426 "--x86-version", Var("nacl_toolchain_revision"), |
| 427 "--nacl-newlib-only", |
441 "--file-hash", "mac_x86_newlib", | 428 "--file-hash", "mac_x86_newlib", |
442 Var("nacl_toolchain_mac_x86_newlib_hash"), | 429 Var("nacl_toolchain_mac_x86_newlib_hash"), |
443 "--file-hash", "win_x86_newlib", | 430 "--file-hash", "win_x86_newlib", |
444 Var("nacl_toolchain_win_x86_newlib_hash"), | 431 Var("nacl_toolchain_win_x86_newlib_hash"), |
445 "--file-hash", "linux_x86_newlib", | 432 "--file-hash", "linux_x86_newlib", |
446 Var("nacl_toolchain_linux_x86_newlib_hash"), | 433 Var("nacl_toolchain_linux_x86_newlib_hash"), |
447 "--file-hash", "mac_x86", | |
448 Var("nacl_toolchain_mac_x86_hash"), | |
449 "--file-hash", "win_x86", | |
450 Var("nacl_toolchain_win_x86_hash"), | |
451 "--file-hash", "linux_x86", | |
452 Var("nacl_toolchain_linux_x86_hash"), | |
453 "--save-downloads-dir", | |
454 "src/native_client_sdk/src/build_tools/toolchain_archives", | |
455 ], | 434 ], |
456 }, | 435 }, |
457 { | 436 { |
458 # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes | 437 # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes |
459 # zero seconds to run. If something changed, it downloads a prebuilt clang, | 438 # zero seconds to run. If something changed, it downloads a prebuilt clang, |
460 # which takes ~20s, but clang speeds up builds by more than 20s. | 439 # which takes ~20s, but clang speeds up builds by more than 20s. |
461 "pattern": ".", | 440 "pattern": ".", |
462 "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], | 441 "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], |
463 }, | 442 }, |
464 { | 443 { |
465 # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 444 # A change to a .gyp, .gypi, or to GYP itself should run the generator. |
466 "pattern": ".", | 445 "pattern": ".", |
467 "action": ["python", "src/build/gyp_chromium"], | 446 "action": ["python", "src/build/gyp_chromium"], |
468 }, | 447 }, |
469 ] | 448 ] |
OLD | NEW |