From 7d4e6d012c16bbe8b7958abf5341193afc1629e6 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 27 Nov 2014 10:41:04 +0000 Subject: [PATCH] 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 --- .gitignore | 1 + DEPS | 2 +- setup_links.py | 1 + sync_chromium.py | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e6f0c88a5b..05345a7177 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,7 @@ /third_party/libsrtp /third_party/libvpx /third_party/libxml +/third_party/libudev /third_party/libyuv /third_party/llvm /third_party/llvm-build diff --git a/DEPS b/DEPS index 9f9d7bd9f3..23231c25fa 100644 --- a/DEPS +++ b/DEPS @@ -9,7 +9,7 @@ vars = { # 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. "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 diff --git a/setup_links.py b/setup_links.py index 0d79e83faa..0dd453c948 100755 --- a/setup_links.py +++ b/setup_links.py @@ -50,6 +50,7 @@ DIRECTORIES = [ 'third_party/libjpeg', 'third_party/libjpeg_turbo', 'third_party/libsrtp', + 'third_party/libudev', 'third_party/libvpx', 'third_party/libyuv', 'third_party/llvm-build', diff --git a/sync_chromium.py b/sync_chromium.py index 1f66a71d37..320f3b3489 100755 --- a/sync_chromium.py +++ b/sync_chromium.py @@ -84,6 +84,10 @@ def main(): 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 = [