Commit cb2e66f4 authored by bradnelson@google.com's avatar bradnelson@google.com

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
parent 98cd28cf
...@@ -8,7 +8,7 @@ vars = { ...@@ -8,7 +8,7 @@ vars = {
"webkit_revision": "101114", "webkit_revision": "101114",
"chromium_git": "http://git.chromium.org/git", "chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281", "swig_revision": "69281",
"nacl_revision": "7169", "nacl_revision": "7281",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's. # to update other nacl_*_revision's.
"nacl_tools_revision": "7139", # native_client/DEPS: tools_rev "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev
...@@ -16,13 +16,19 @@ vars = { ...@@ -16,13 +16,19 @@ vars = {
# These hashes need to be updated when nacl_toolchain_revision is changed. # These hashes need to be updated when nacl_toolchain_revision is changed.
# After changing nacl_toolchain_revision, run 'gclient runhooks' to get the # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
# new values. # 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": "nacl_toolchain_mac_x86_newlib_hash":
"74612a65dd6bae1d85af1f7277cc6af6e5d86b46", "648b5ae8ae770b41c4a0eef28cff6f67fe8bb386",
"nacl_toolchain_win_x86_hash":
"75ee1d6f8c758d9580b2c35773b14d0ab6847372",
"nacl_toolchain_win_x86_newlib_hash": "nacl_toolchain_win_x86_newlib_hash":
"3672e7b20848beec886badc46909cf24fb1c574f", "a340bc72900f002f88491bf82baf69d35593ed75",
"nacl_toolchain_linux_x86_newlib_hash": "nacl_toolchain_revision": "7258",
"528b9b85d087ffb5a0f6348f5219a33cd0ff725f",
"nacl_toolchain_revision": "7098",
"libjingle_revision": "95", "libjingle_revision": "95",
"libvpx_revision": "109236", "libvpx_revision": "109236",
...@@ -102,6 +108,12 @@ deps = { ...@@ -102,6 +108,12 @@ deps = {
"src/native_client": "src/native_client":
Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), 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": "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
...@@ -423,14 +435,23 @@ hooks = [ ...@@ -423,14 +435,23 @@ hooks = [
"pattern": ".", "pattern": ".",
"action": [ "action": [
"python", "src/build/download_nacl_toolchains.py", "python", "src/build/download_nacl_toolchains.py",
"--no-pnacl",
"--no-arm-trusted",
"--x86-version", Var("nacl_toolchain_revision"), "--x86-version", Var("nacl_toolchain_revision"),
"--nacl-newlib-only",
"--file-hash", "mac_x86_newlib", "--file-hash", "mac_x86_newlib",
Var("nacl_toolchain_mac_x86_newlib_hash"), Var("nacl_toolchain_mac_x86_newlib_hash"),
"--file-hash", "win_x86_newlib", "--file-hash", "win_x86_newlib",
Var("nacl_toolchain_win_x86_newlib_hash"), Var("nacl_toolchain_win_x86_newlib_hash"),
"--file-hash", "linux_x86_newlib", "--file-hash", "linux_x86_newlib",
Var("nacl_toolchain_linux_x86_newlib_hash"), 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",
], ],
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment