commit 7d4e6d012c16bbe8b7958abf5341193afc1629e6
author kjellander@webrtc.org <kjellander@webrtc.org> Thu Nov 27 10:41:04 2014 +0000
committer kjellander@webrtc.org <kjellander@webrtc.org> Thu Nov 27 10:41:04 2014 +0000
tree df8271bd814fcc55369f14180849bf9368bf873a
parent d952c40c7e31c1603988c1f09ebfba9f17c6a866

Roll chromium_revision d8c9041..309cf65

Relevant changes:
* testing/gtest 4650552..8245545
* testing/gmock 896ba0e..2976396
* third_party/boringssl 2f3ba91..69a0160
* third_party/icu: 6242e2f..dd72764
* third_party/libyuv: 5a09c3e..d204db6
* tools/gyp: b13d8f2..0a381c0

Details: https://chromium.googlesource.com/chromium/src/+/d8c9041..309cf65/DEPS

Clang version was not updated in this roll.

R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/25219004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7757 4adac7df-926f-26a2-2b94-8c16560cd09d

sync_chromium.py

diff --git a/sync_chromium.py b/sync_chromium.py
index 1f66a71..320f3b3 100755
--- a/sync_chromium.py
+++ b/sync_chromium.py
@@ -84,6 +84,10 @@
     os.unlink(flag_file)
 
   env = os.environ.copy()
+
+  # Avoid downloading NaCl toolchain as part of the Chromium hooks.
+  env.setdefault('GYP_DEFINES', '')
+  env['GYP_DEFINES'] += ' disable_nacl=1'
   env['GYP_CHROMIUM_NO_ACTION'] = '1'
   gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
   args = [