Skip to content

Commit 57bf4b1

Browse files
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. [email protected] Review URL: https://webrtc-codereview.appspot.com/25219004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7757 4adac7df-926f-26a2-2b94-8c16560cd09d
1 parent f64fcf6 commit 57bf4b1

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
/third_party/libsrtp
8989
/third_party/libvpx
9090
/third_party/libxml
91+
/third_party/libudev
9192
/third_party/libyuv
9293
/third_party/llvm
9394
/third_party/llvm-build

DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ vars = {
99
# Use this googlecode_url variable only if there is an internal mirror for it.
1010
# If you do not know, use the full path while defining your new deps entry.
1111
"googlecode_url": "http://%s.googlecode.com/svn",
12-
"chromium_revision": "d8c90415d681a7c3727e3ef70873bc4f44dd3ab0",
12+
"chromium_revision": "309cf653131ccf0e15d5dfb507330b5a1e81253b",
1313
}
1414

1515
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

setup_links.py

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
'third_party/libjpeg',
5151
'third_party/libjpeg_turbo',
5252
'third_party/libsrtp',
53+
'third_party/libudev',
5354
'third_party/libvpx',
5455
'third_party/libyuv',
5556
'third_party/llvm-build',

sync_chromium.py

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ def main():
8484
os.unlink(flag_file)
8585

8686
env = os.environ.copy()
87+
88+
# Avoid downloading NaCl toolchain as part of the Chromium hooks.
89+
env.setdefault('GYP_DEFINES', '')
90+
env['GYP_DEFINES'] += ' disable_nacl=1'
8791
env['GYP_CHROMIUM_NO_ACTION'] = '1'
8892
gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
8993
args = [

0 commit comments

Comments
 (0)