summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authornoelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 02:28:51 +0000
committernoelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 02:28:51 +0000
commita95c58716a28c616c2cf80f1d87c6f6cf8f23c93 (patch)
tree2030de22def76e3d3e6c1d2cf262813ddb034050 /DEPS
parent2f109dbaf81360bbcfba8a83dca670eafd8ceab1 (diff)
downloadchromium_src-a95c58716a28c616c2cf80f1d87c6f6cf8f23c93.zip
chromium_src-a95c58716a28c616c2cf80f1d87c6f6cf8f23c93.tar.gz
chromium_src-a95c58716a28c616c2cf80f1d87c6f6cf8f23c93.tar.bz2
Support optional PNaCl download by bots.
Adds and optional download for bots triggered by environment variable. This download will only happen on SDK bots until we switch to PNaCl. BUG= 112929 Review URL: http://codereview.chromium.org/9323023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS12
1 files changed, 11 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index fa0cef4..36d6a9f 100644
--- a/DEPS
+++ b/DEPS
@@ -24,11 +24,18 @@ vars = {
"85e8e983a1c71f16e2f2502d8836f3a8321bc9b3",
"nacl_toolchain_mac_x86_newlib_hash":
"0f251d82517afaf61e2ad1f4b4ee0448cf23a581",
+ "nacl_toolchain_pnacl_darwin_i386_hash":
+ "68ce47b94a4df3abac9e7f066d830c04a767714e",
+ "nacl_toolchain_pnacl_linux_i686_hash":
+ "3c802b75bdc773d9ea7938783264e5e7d5bb6121",
+ "nacl_toolchain_pnacl_linux_x86_64_hash":
+ "61da7fe1684b1248f6a3a5104b1da8eac3f7c98f",
"nacl_toolchain_win_x86_hash":
"8dbc9546ece247a90bbaeab58450854be1289252",
"nacl_toolchain_win_x86_newlib_hash":
"408f8c946802a0acd6f9004b73fce74ca60ac1db",
"nacl_toolchain_revision": "7712",
+ "pnacl_toolchain_revision": "7700",
"libjingle_revision": "114",
"libphonenumber_revision": "425",
@@ -458,8 +465,11 @@ hooks = [
"pattern": ".",
"action": [
"python", "src/build/download_nacl_toolchains.py",
- "--no-pnacl",
"--no-arm-trusted",
+ "--optional-pnacl",
+ "--pnacl-version", Var("pnacl_toolchain_revision"),
+ "--file-hash", "pnacl_linux_i686",
+ Var("nacl_toolchain_pnacl_linux_x86_64_hash"),
"--x86-version", Var("nacl_toolchain_revision"),
"--file-hash", "mac_x86_newlib",
Var("nacl_toolchain_mac_x86_newlib_hash"),