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/.gn b/.gn
index f849ef7..b1eb19d 100644
--- a/.gn
+++ b/.gn
@@ -24,6 +24,7 @@
# to force additional review for new uses of exec_script, which is strongly
# discouraged except for gypi_to_gn calls.
exec_script_whitelist = [
+ "//build/config/BUILD.gn",
"//build/config/android/BUILD.gn",
"//build/config/android/config.gni",
"//build/config/android/internal_rules.gni",
diff --git a/DEPS b/DEPS
index 5ae15c6..f5d863e 100644
--- a/DEPS
+++ b/DEPS
@@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
- 'chromium_revision': '1d144ca7f86e0c684c67d6c1b6d5414ca9074615',
+ 'chromium_revision': 'fa5d546954c631d87299cd9a3fd3cd1d4ebc1931',
}
# NOTE: Use http rather than https; the latter can cause problems for users
diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi
index ad82f4b..f672226 100644
--- a/webrtc/modules/audio_processing/audio_processing_tests.gypi
+++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi
@@ -72,6 +72,18 @@
'sources': [
'intelligibility/test/intelligibility_proc.cc',
],
+ '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',
+ ],
+ },
+ }],
+ ],
}, # intelligibility_proc
],
'conditions': [
diff --git a/webrtc/supplement.gypi b/webrtc/supplement.gypi
index edccd4d..183255b 100644
--- a/webrtc/supplement.gypi
+++ b/webrtc/supplement.gypi
@@ -5,10 +5,6 @@
# Override the default (10.6) in Chromium's build/common.gypi.
# Needed for ARC and libc++.
'mac_deployment_target%': '10.7',
- # Disable use of sysroot for Linux. It's enabled by default in Chromium,
- # but it currently lacks the libudev-dev package.
- # TODO(kjellander): Remove when crbug.com/561584 is fixed.
- 'use_sysroot': 0,
},
'webrtc_root%': '<(webrtc_root)',
'mac_deployment_target%': '<(mac_deployment_target)',
diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index 492690d..cb5650d 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -41,6 +41,9 @@
'channel_transport/udp_transport_impl.cc',
'channel_transport/udp_transport_impl.h',
],
+ 'msvs_disabled_warnings': [
+ 4302, # cast truncation
+ ],
'conditions': [
['OS=="win" and clang==1', {
'msvs_settings': {
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"', {