Roll chromium_revision 1d144ca..fa5d546 (375480:376142)
* Disable iOS warnings triggered by moving from ios_deployment_target 7.0 to 9.0
(see https://chromium.googlesource.com/chromium/src/+/1d144ca..fa5d546/build/common.gypi)
* Fix errors that will fail when MSVS 2015 is rolled in (coming soon).
* Start using sysroot for building on Linux since http://crbug.com/561584 has been fixed.
Change log: https://chromium.googlesource.com/chromium/src/+log/1d144ca..fa5d546
Full diff: https://chromium.googlesource.com/chromium/src/+/1d144ca..fa5d546
Changed dependencies:
* src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/903c91c..20343f4
* src/tools/gyp: https://chromium.googlesource.com/external/gyp.git/+log/2f9ffdc..ed163ce
DEPS diff: https://chromium.googlesource.com/chromium/src/+/1d144ca..fa5d546/DEPS
No update to Clang.
TBR=
BUG=webrtc:5549
NOTRY=True
Review URL: https://codereview.webrtc.org/1713493002 .
Cr-Commit-Position: refs/heads/master@{#11673}
diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp
index 1ce450b..6e9f3b4 100755
--- a/webrtc/webrtc_examples.gyp
+++ b/webrtc/webrtc_examples.gyp
@@ -165,6 +165,16 @@
],
},
'conditions': [
+ ['OS=="ios"', {
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': [
+ # Suppress compiler warnings about deprecated that triggered
+ # when moving from ios_deployment_target 7.0 to 9.0.
+ # See webrtc:5549 for more details.
+ '-Wno-deprecated-declarations',
+ ],
+ },
+ }],
['OS=="mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET' : '10.8',
@@ -235,6 +245,16 @@
'../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc',
],
'conditions': [
+ ['OS=="ios"', {
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': [
+ # Suppress compiler warnings about deprecated that triggered
+ # when moving from ios_deployment_target 7.0 to 9.0.
+ # See webrtc:5549 for more details.
+ '-Wno-deprecated-declarations',
+ ],
+ },
+ }],
['OS=="mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET' : '10.8',
@@ -286,6 +306,12 @@
],
'xcode_settings': {
'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/ios/Info.plist',
+ 'WARNING_CFLAGS': [
+ # Suppress compiler warnings about deprecated that triggered
+ # when moving from ios_deployment_target 7.0 to 9.0.
+ # See webrtc:5549 for more details.
+ '-Wno-deprecated-declarations',
+ ],
},
}],
['OS=="mac"', {