diff --git a/DEPS b/DEPS index 4912f7f4db..7c26e9a142 100644 --- a/DEPS +++ b/DEPS @@ -3,7 +3,7 @@ vars = { # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "134666", + "chromium_revision": "140240", # External resources like video and audio files used for testing purposes. # Downloaded on demand when needed. diff --git a/third_party/google-gflags/google-gflags.gyp b/third_party/google-gflags/google-gflags.gyp index bd7a3edd4b..cd75ad5d96 100644 --- a/third_party/google-gflags/google-gflags.gyp +++ b/third_party/google-gflags/google-gflags.gyp @@ -56,6 +56,11 @@ 'src/windows/port.cc', ], }], + ['OS=="mac" and clang==1', { + 'xcode_settings': { + 'WARNING_CFLAGS!': ['-Wheader-hygiene'], + }, + }], ], }, ], diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index 6bb46c2380..8c971731fe 100644 --- a/third_party/libvpx/libvpx.gyp +++ b/third_party/libvpx/libvpx.gyp @@ -7,6 +7,21 @@ # libvpx_include, libvpx_lib. # http://src.chromium.org/svn/trunk/deps/third_party/libvpx/libvpx.gyp { + # The target_defaults block is unique to the WebRTC libvpx.gyp. + 'target_defaults': { + 'conditions': [ + ['OS=="mac"', { + 'xcode_settings': { + 'WARNING_CFLAGS': [ + '-Wno-implicit-function-declaration', + # TODO(andrew): this one should be fixed upstream. + '-Wno-parentheses-equality', + '-Wno-conversion', + ], + }, + }], + ], + }, 'variables': { 'conditions': [ ['os_posix==1', {