Skip to content

Commit

Permalink
Changes to allow the nacl sdk to build in a chrome checkout.
Browse files Browse the repository at this point in the history
- Pulling in pymox (now with corrected headers, mirroring coming soon).
- Pulling in glibc toolchains.
- Pulling in sdk build binaries.

BUG=http://code.google.com/p/chromium/issues/detail?id=105568
TEST=None
R=noelallen@google.com
Review URL: http://codereview.chromium.org/8659005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111736 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
bradnelson@google.com committed Nov 28, 2011
1 parent f9ffb89 commit bbc90fe
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 4 deletions.
34 changes: 30 additions & 4 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ 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",
"5f82c18ce9d0201f9df852bddcb19746ef690290",
"nacl_toolchain_mac_x86_hash":
"f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed",
"nacl_toolchain_mac_x86_newlib_hash":
"648b5ae8ae770b41c4a0eef28cff6f67fe8bb386",
"648b5ae8ae770b41c4a0eef28cff6f67fe8bb386",
"nacl_toolchain_win_x86_hash":
"75ee1d6f8c758d9580b2c35773b14d0ab6847372",
"nacl_toolchain_win_x86_newlib_hash":
"a340bc72900f002f88491bf82baf69d35593ed75",
"a340bc72900f002f88491bf82baf69d35593ed75",
"nacl_toolchain_revision": "7258",

"libjingle_revision": "95",
Expand Down Expand Up @@ -102,6 +108,13 @@ 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"),

# TODO(bradnelson): Switch to googlecode_url once mirroring is up.
"src/third_party/pymox/src":
"http://pymox.googlecode.com/svn/trunk@70",

"src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
Expand Down Expand Up @@ -341,6 +354,10 @@ deps_os = {
# latest release binaries for the toolchain.
"src/third_party/syzygy/binaries":
(Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@543",

# Binaries for nacl sdk.
"src/third_party/nacl_sdk_binaries":
"/trunk/deps/third_party/nacl_sdk_binaries@111576",
},
"mac": {
"src/chrome/tools/test/reference_build/chrome_mac":
Expand Down Expand Up @@ -423,14 +440,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",
],
},
{
Expand Down
10 changes: 10 additions & 0 deletions third_party/pymox/README.chromium
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Name: Python Mox
Short Name: pymox
URL: http://pymox.googlecode.com/svn/trunk
License File: COPYING
Security Critical: no
Version: NA
Revision: r70

Local files (not taken from upstream):
README.chromium

0 comments on commit bbc90fe

Please sign in to comment.