diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-06-04 23:14:37 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-06-04 23:14:37 +0000 |
| commit | 3007b26591e4f6631d07807e85cd5ea7c13a347b (patch) | |
| tree | 8f3f0d9d9edf0c95237b382af5d0c7eb834b793c /third_party | |
| parent | da7fdf4af8d401625747d9fbbc64b07e5c617e59 (diff) | |
| download | webrtc-3007b26591e4f6631d07807e85cd5ea7c13a347b.tar.gz | |
Roll Chromium 134666:140240.
This brings in a common.gypi change which enables warnings-as-errors on
Mac. Necessitated some modifications to third-party gyps.
BUG=none
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/618004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2361 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/google-gflags/google-gflags.gyp | 5 | ||||
| -rw-r--r-- | third_party/libvpx/libvpx.gyp | 15 |
2 files changed, 20 insertions, 0 deletions
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', { |