diff --git a/.gitignore b/.gitignore index e6f0c88a5..05345a717 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 9f9d7bd9f..23231c25f 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 0d79e83fa..0dd453c94 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 1f66a71d3..320f3b348 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 = [