From 7635684130cc3a071d245b607fddec059002e7fa Mon Sep 17 00:00:00 2001
From: tkchin <tkchin@webrtc.org>
Date: Wed, 2 Dec 2015 16:42:18 -0800
Subject: [PATCH] Fix Mac ObjC PeerConnection API compilation.

BUG=webrtc:5287,webrtc:5216

Review URL: https://codereview.webrtc.org/1493003002

Cr-Commit-Position: refs/heads/master@{#10876}
---
 talk/build/merge_ios_libs.gyp | 2 +-
 talk/libjingle.gyp            | 2 +-
 talk/libjingle_tests.gyp      | 2 +-
 webrtc/webrtc_examples.gyp    | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/talk/build/merge_ios_libs.gyp b/talk/build/merge_ios_libs.gyp
index 0c7114da14..f7e4875eba 100644
--- a/talk/build/merge_ios_libs.gyp
+++ b/talk/build/merge_ios_libs.gyp
@@ -27,7 +27,7 @@
 {
   'includes': ['common.gypi',],
   'conditions': [
-    ['OS=="ios" or (OS=="mac" and mac_sdk>="10.8")', {
+    ['OS=="ios" or OS=="mac"', {
       'targets': [
         {
           'target_name': 'libjingle_peerconnection_objc_no_op',
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 0a272c7be9..c9ef58d5c9 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -248,7 +248,7 @@
         }, # libjingle_peerconnection_java
       ]
     }],
-    ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', {
+    ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
       # The >= 10.7 above is required for ARC.
       'targets': [
         {
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index be64c5ece8..511f7d5ffc 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@@ -332,7 +332,7 @@
         },
       ],  # targets
     }],  # OS=="android"
-    ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', {
+    ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
       # The >=10.7 above is required to make ARC link cleanly (e.g. as
       # opposed to _compile_ cleanly, which the library under test
       # does just fine on 10.6 too).
diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp
index b92a34bf41..e35f5f2bdf 100755
--- a/webrtc/webrtc_examples.gyp
+++ b/webrtc/webrtc_examples.gyp
@@ -132,7 +132,7 @@
       ], # targets
     }],  # OS=="linux" or OS=="win"
 
-    ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")', {
+    ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
       'targets': [
         {
           'target_name': 'apprtc_common',
@@ -332,6 +332,7 @@
             'CLANG_ENABLE_OBJC_ARC': 'YES',
             'WARNING_CFLAGS': [
               '-Wno-deprecated-declarations',
+              '-Wno-nonnull',
             ],
           },
           'link_settings': {
@@ -344,7 +345,7 @@
           }
         },  # target socketrocket
       ],  # targets
-    }],  # OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")
+    }],  # OS=="ios" or (OS=="mac" and target_arch!="ia32")
 
     ['OS=="android"', {
       'targets': [