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
This commit is contained in:
andrew@webrtc.org 2012-06-04 23:14:37 +00:00
parent da7fdf4af8
commit 3007b26591
3 changed files with 21 additions and 1 deletions

2
DEPS
View File

@ -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.

View File

@ -56,6 +56,11 @@
'src/windows/port.cc',
],
}],
['OS=="mac" and clang==1', {
'xcode_settings': {
'WARNING_CFLAGS!': ['-Wheader-hygiene'],
},
}],
],
},
],

View File

@ -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', {