Roll chromium_revision 1d144ca..fa5d546 (375480:376142)

webrtc/webrtc_examples.gyp

 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 {
   'includes': [
     '../talk/build/common.gypi',
@@ skipping 147 matching lines @@
           ],
           'include_dirs': [
             'examples/objc/AppRTCDemo/common',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'examples/objc/AppRTCDemo/common',
             ],
           },
           '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',
               },
             }],
           ],
           'link_settings': {
             'xcode_settings': {
               'OTHER_LDFLAGS': [
                 '-framework QuartzCore',
@@ skipping 50 matching lines @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'examples/objc/AppRTCDemo',
             ],
           },
           'export_dependent_settings': [
             '../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',
               },
             }],
           ],
         },
         {
           'target_name': 'AppRTCDemo',
           'type': 'executable',
@@ skipping 31 matching lines @@
                 'examples/objc/AppRTCDemo/ios/ARDVideoCallView.m',
                 'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h',
                 'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m',
                 'examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch',
                 'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h',
                 'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m',
                 'examples/objc/AppRTCDemo/ios/main.m',
               ],
               '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"', {
               'sources': [
                 'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h',
                 'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m',
                 'examples/objc/AppRTCDemo/mac/APPRTCViewController.h',
                 'examples/objc/AppRTCDemo/mac/APPRTCViewController.m',
                 'examples/objc/AppRTCDemo/mac/main.m',
               ],
@@ skipping 111 matching lines @@
             'apk_name': 'AppRTCDemoTest',
             'java_in_dir': 'examples/androidtests',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],  # targets
     }],  # OS=="android"
   ],
 }