diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 06:19:15 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 06:19:15 +0000 |
| commit | cb2e66f4c9b005758ee73f6699d4460eeadb9716 (patch) | |
| tree | dbeec512807014fd59d06e80830b48dd3a1f4f00 /DEPS | |
| parent | 98cd28cf18cae056f711d7238f98bc04bb2b4a6e (diff) | |
| download | chromium_src-cb2e66f4c9b005758ee73f6699d4460eeadb9716.zip chromium_src-cb2e66f4c9b005758ee73f6699d4460eeadb9716.tar.gz chromium_src-cb2e66f4c9b005758ee73f6699d4460eeadb9716.tar.bz2 | |
Bumping nacl rev into chrome.
Start downloading glibc toolchain in chrome.
Adding pymox to chrome for sdk.
Adding duplicate of nacl's site_scons for the sdk.
BUG=None
TEST=None
R=noelallen@google.com
Review URL: http://codereview.chromium.org/8677032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 35 |
1 files changed, 28 insertions, 7 deletions
@@ -8,7 +8,7 @@ vars = { "webkit_revision": "101114", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "7169", + "nacl_revision": "7281", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev @@ -16,13 +16,19 @@ vars = { # These hashes need to be updated when nacl_toolchain_revision is changed. # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the # new values. + "nacl_toolchain_linux_x86_hash": + "33afa1cefa7fd2a7270b309298dbbf93361d90db", + "nacl_toolchain_linux_x86_newlib_hash": + "5f82c18ce9d0201f9df852bddcb19746ef690290", + "nacl_toolchain_mac_x86_hash": + "f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed", "nacl_toolchain_mac_x86_newlib_hash": - "74612a65dd6bae1d85af1f7277cc6af6e5d86b46", + "648b5ae8ae770b41c4a0eef28cff6f67fe8bb386", + "nacl_toolchain_win_x86_hash": + "75ee1d6f8c758d9580b2c35773b14d0ab6847372", "nacl_toolchain_win_x86_newlib_hash": - "3672e7b20848beec886badc46909cf24fb1c574f", - "nacl_toolchain_linux_x86_newlib_hash": - "528b9b85d087ffb5a0f6348f5219a33cd0ff725f", - "nacl_toolchain_revision": "7098", + "a340bc72900f002f88491bf82baf69d35593ed75", + "nacl_toolchain_revision": "7258", "libjingle_revision": "95", "libvpx_revision": "109236", @@ -102,6 +108,12 @@ deps = { "src/native_client": Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), + + "src/native_client_sdk/src/site_scons": + Var("nacl_trunk") + "/src/native_client/site_scons@" + Var("nacl_revision"), + + "src/third_party/pymox": + "http://pymox.googlecode.com/svn/trunk@61", "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + @@ -423,14 +435,23 @@ hooks = [ "pattern": ".", "action": [ "python", "src/build/download_nacl_toolchains.py", + "--no-pnacl", + "--no-arm-trusted", "--x86-version", Var("nacl_toolchain_revision"), - "--nacl-newlib-only", "--file-hash", "mac_x86_newlib", Var("nacl_toolchain_mac_x86_newlib_hash"), "--file-hash", "win_x86_newlib", Var("nacl_toolchain_win_x86_newlib_hash"), "--file-hash", "linux_x86_newlib", Var("nacl_toolchain_linux_x86_newlib_hash"), + "--file-hash", "mac_x86", + Var("nacl_toolchain_mac_x86_hash"), + "--file-hash", "win_x86", + Var("nacl_toolchain_win_x86_hash"), + "--file-hash", "linux_x86", + Var("nacl_toolchain_linux_x86_hash"), + "--save-downloads-dir", + "src/native_client_sdk/src/build_tools/toolchain_archives", ], }, { |