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: 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
This commit is contained in:
kjellander@webrtc.org
2014-11-27 10:41:04 +00:00
parent d952c40c7e
commit 7d4e6d012c
4 changed files with 7 additions and 1 deletions

1
.gitignore vendored
View File

@@ -88,6 +88,7 @@
/third_party/libsrtp /third_party/libsrtp
/third_party/libvpx /third_party/libvpx
/third_party/libxml /third_party/libxml
/third_party/libudev
/third_party/libyuv /third_party/libyuv
/third_party/llvm /third_party/llvm
/third_party/llvm-build /third_party/llvm-build

2
DEPS
View File

@@ -9,7 +9,7 @@ vars = {
# Use this googlecode_url variable only if there is an internal mirror for it. # Use this googlecode_url variable only if there is an internal mirror for it.
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
"chromium_revision": "d8c90415d681a7c3727e3ef70873bc4f44dd3ab0", "chromium_revision": "309cf653131ccf0e15d5dfb507330b5a1e81253b",
} }
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

View File

@@ -50,6 +50,7 @@ DIRECTORIES = [
'third_party/libjpeg', 'third_party/libjpeg',
'third_party/libjpeg_turbo', 'third_party/libjpeg_turbo',
'third_party/libsrtp', 'third_party/libsrtp',
'third_party/libudev',
'third_party/libvpx', 'third_party/libvpx',
'third_party/libyuv', 'third_party/libyuv',
'third_party/llvm-build', 'third_party/llvm-build',

View File

@@ -84,6 +84,10 @@ def main():
os.unlink(flag_file) os.unlink(flag_file)
env = os.environ.copy() 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' env['GYP_CHROMIUM_NO_ACTION'] = '1'
gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient' gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
args = [ args = [