summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authormpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-16 14:04:04 +0000
committermpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-16 14:04:04 +0000
commitdb92d8827b79d85abc83fcfb35f98fb6dfe87b87 (patch)
tree426ec6f420bdaf2c41ec92aba00cd35e013ddf38 /DEPS
parent0be395e277a06e4e84c265e3ccd15a5dec94b230 (diff)
downloadchromium_src-db92d8827b79d85abc83fcfb35f98fb6dfe87b87.zip
chromium_src-db92d8827b79d85abc83fcfb35f98fb6dfe87b87.tar.gz
chromium_src-db92d8827b79d85abc83fcfb35f98fb6dfe87b87.tar.bz2
Revert 146795 - NaCl: Update revision in DEPS, r9121 -> r9146
This pulls in the following Native Client changes: r9122: (eaeltsin) Debug stub: add OWNERS r9123: (eaeltsin) Debug stub: fix G packet reply r9124: (jvoung) Roll archived translator to 9103, since the driver now expects the r9125: (jvoung) Make unsupported split-pexe experiment script handle N > 2. r9126: (robertm) Cleanup tools/llvm and rename the toolchain creator scripts r9127: (robertm) Fix typo in SCcostruct which breaks one of the pnacl TC bots r9128: (eaeltsin) Debug stub: fix broken thread refcount r9129: (mseaborn) x86-32: Make the gs segment read-only for untrusted code r9130: (mseaborn) Reduce the log level of a startup message on x86-32 r9131: (mseaborn) Cleanup: Move some Linux+Mac service_runtime files into the "posix" directory r9132: (robertm) Recreate the dummydir at tools/llvm/dummydir and prepare a new one r9133: (jvoung) Use chrome flag "--pnacl-dir=pnacl_root/" where pnacl_root is the "installed" r9134: (robertm) Add an options to use the stock qemu provided by the host system for ARM. r9135: (ncbray) Increase the error level for messages related to command channel creation failiures. r9136: (eaeltsin) Debug stub: change Abi::RegType meaning r9137: (robertm) Redirect dummydir to a location under pnacl/ rather than tools/llvm r9138: (sergeyu) Fix build_nexe.py to build .cpp files as C++ files. r9139: (sergeyu) Respect defines parameter for untrusted targets. r9140: (jvoung) Roll archived pexe rev to 9129 to account for new test. r9141: (robertm) Manual revert of http://codereview.chromium.org/8698014/ r9142: (robertm) Redirect two invocations of "qemu_tool.sh run" to the equivalent but more r9143: (ncbray) Update nacl_uma test to work with new chrome://histograms semantics. r9144: (bsy) Revert change to remove positive detail-level log statements at compile-time. r9145: (jvoung) Change archived pexe from 9129 to 9132 (9129 did not actually upload). r9146: (halyavin) Build MinGW to correct folder. BUG=none TEST=nacl_integration Review URL: https://chromiumcodereview.appspot.com/10793006 TBR=mseaborn@chromium.org Review URL: https://chromiumcodereview.appspot.com/10783018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index c101ee5..830b1dc 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ vars = {
"chromium_git": "http://git.chromium.org/git",
"chromiumos_git": "http://git.chromium.org/chromiumos",
"swig_revision": "69281",
- "nacl_revision": "9146",
+ "nacl_revision": "9121",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "9016", # native_client/DEPS: tools_rev