Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1814)

Unified Diff: webrtc/webrtc_examples.gyp

Issue 1713493002: Roll chromium_revision 1d144ca..fa5d546 (375480:376142) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: A collection of fixes Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/test/test.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/webrtc_examples.gyp
diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp
index 1ce450b0f100467d08f08f4c9cacb46b314122a3..6e9f3b45ed52475d3f5cb727979c4a67f931a356 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"', {
« no previous file with comments | « webrtc/test/test.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698