summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorbsy@google.com <bsy@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 06:01:46 +0000
committerbsy@google.com <bsy@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 06:01:46 +0000
commit5c56b3a6c8c932d0b1e3fbd44cb97c5a597f2aef (patch)
treee73e49e2495422e60427183e25e52e49076f77a4 /DEPS
parentf7b8651bf8d82996dc9426553b13d35de413681e (diff)
downloadchromium_src-5c56b3a6c8c932d0b1e3fbd44cb97c5a597f2aef.zip
chromium_src-5c56b3a6c8c932d0b1e3fbd44cb97c5a597f2aef.tar.gz
chromium_src-5c56b3a6c8c932d0b1e3fbd44cb97c5a597f2aef.tar.bz2
Merge branch 'master' of http://git.chromium.org/chromium/src into mywork
Collect NaClLog messages from just prior to crash and display in JavaScript console. Test command line, after building chrome: NACLVERBOSITY=6 NACL_PLUGIN_DEBUG=1 NACL_FAULT_INJECTION=BeforeLoadIrt=GF2 out/Release/chrome --user-data-dir=/tmp/udd This causes the service runtime to abort just prior to loading the IRT. After this "crash", open up the JavaScript console and see the log messages, including those from the fault injection library. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2776 TEST= manual, using the fault injection library Review URL: https://chromiumcodereview.appspot.com/10806005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147401 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 0e25a4b..3e565b5 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": "9121",
+ "nacl_revision": "9166",
# 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