Enable SCTP in libjingle.

third_party/usrsctp/usrsctp.gyp

Index: third_party/usrsctp/usrsctp.gyp
===================================================================
--- third_party/usrsctp/usrsctp.gyp	(revision 204288)
+++ third_party/usrsctp/usrsctp.gyp	(working copy)
@@ -2,55 +2,120 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'targets': [
-    {
-      'target_name': 'usrsctplib',
-      'type': 'static_library',
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '.',
-        ],
-        'defines': [
-          'INET',
-          'SCTP_PROCESS_LEVEL_LOCKS',
-          'SCTP_SIMPLE_ALLOCATOR',
-          'STDC_HEADERS',
-          'USE_SCTP_SHA1',
-          '__Userspace__',
-          # 'SCTP_DEBUG', # Uncomment for SCTP debugging.
-        ],
-      },
+  'variables': {
+    'libsctp_target_type%': 'static_library',
+  },
+  'target_defaults': {
+    'defines': [
+      'INET',
+      'SCTP_PROCESS_LEVEL_LOCKS',
+      'SCTP_SIMPLE_ALLOCATOR',
+      'USE_SCTP_SHA1',
+      '__Userspace__',
+      # 'SCTP_DEBUG', # Uncomment for SCTP debugging.
+    ],
+    'include_dirs': [
+      'overrides/usrsctplib',
+      'usrsctplib/',
+      'usrsctplib/netinet',
+      'usrsctplib/netinet6',
+    ],
+    'direct_dependent_settings': {
       'include_dirs': [
+        'overrides/usrsctplib',
         'usrsctplib/',
         'usrsctplib/netinet',
         'usrsctplib/netinet6',
       ],
+    },
+    'conditions': [
+      ['OS == "linux"', {
+        'include_dirs': [
+          '/usr/include/nss',
+          '/usr/include/nspr',
+        ],
+      }],
+      ['OS == "mac" or OS == "ios" or OS == "win"', {
+        'dependencies': [
+          '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
+          '<(DEPTH)/third_party/nss/nss.gyp:nspr',
+          '<(DEPTH)/third_party/nss/nss.gyp:nss',
+        ],
+      }],
+      ['OS == "mac"', {
+        'defines': [
+          '__APPLE__',
+        ],
+      }],
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'usrsctplib',
+      'type': 'static_library',
       'sources': [
+        'overrides/usrsctplib/netinet/sctp_sha1.c',
+        'overrides/usrsctplib/netinet/sctp_sha1.h',
+
+        'usrsctplib/usrsctp.h',
+        'usrsctplib/user_atomic.h',
         'usrsctplib/user_environment.c',
+        'usrsctplib/user_environment.h',
+        'usrsctplib/user_inpcb.h',
+        'usrsctplib/user_ip6_var.h',
+        'usrsctplib/user_ip_icmp.h',
         'usrsctplib/user_mbuf.c',
+        'usrsctplib/user_mbuf.h',
+        'usrsctplib/user_queue.h',
         'usrsctplib/user_recv_thread.c',
+        'usrsctplib/user_recv_thread.h',
+        'usrsctplib/user_route.h',
         'usrsctplib/user_sctp_timer_iterate.c',
         'usrsctplib/user_socket.c',
+        'usrsctplib/user_socketvar.h',
+        'usrsctplib/user_uma.h',
         'usrsctplib/netinet/sctp_asconf.c',
+        'usrsctplib/netinet/sctp_asconf.h',
         'usrsctplib/netinet/sctp_auth.c',
+        'usrsctplib/netinet/sctp_auth.h',
         'usrsctplib/netinet/sctp_bsd_addr.c',
+        'usrsctplib/netinet/sctp_bsd_addr.h',
         'usrsctplib/netinet/sctp_callout.c',
+        'usrsctplib/netinet/sctp_callout.h',
         'usrsctplib/netinet/sctp_cc_functions.c',
+        'usrsctplib/netinet/sctp_constants.h',
         'usrsctplib/netinet/sctp_crc32.c',
+        'usrsctplib/netinet/sctp_crc32.h',
+        'usrsctplib/netinet/sctp_hashdriver.h',
         'usrsctplib/netinet/sctp_hashdriver.c',
+        'usrsctplib/netinet/sctp_header.h',
         'usrsctplib/netinet/sctp_indata.c',
+        'usrsctplib/netinet/sctp_indata.h',
         'usrsctplib/netinet/sctp_input.c',
+        'usrsctplib/netinet/sctp_input.h',
+        'usrsctplib/netinet/sctp_lock_userspace.h',
+        'usrsctplib/netinet/sctp_os.h',
+        'usrsctplib/netinet/sctp_os_userspace.h',
         'usrsctplib/netinet/sctp_output.c',
+        'usrsctplib/netinet/sctp_output.h',
         'usrsctplib/netinet/sctp_pcb.c',
+        'usrsctplib/netinet/sctp_pcb.h',
         'usrsctplib/netinet/sctp_peeloff.c',
-        'usrsctplib/netinet/sctp_sha1.c',
+        'usrsctplib/netinet/sctp_peeloff.h',
         'usrsctplib/netinet/sctp_ss_functions.c',
+        'usrsctplib/netinet/sctp_structs.h',
         'usrsctplib/netinet/sctp_sysctl.c',
+        'usrsctplib/netinet/sctp_sysctl.h',
+        'usrsctplib/netinet/sctp_timer.c',
+        'usrsctplib/netinet/sctp_timer.h',
+        'usrsctplib/netinet/sctp_uio.h',
         'usrsctplib/netinet/sctp_userspace.c',
-        'usrsctplib/netinet/sctp_timer.c',
         'usrsctplib/netinet/sctp_usrreq.c',
         'usrsctplib/netinet/sctputil.c',
+        'usrsctplib/netinet/sctputil.h',
+        'usrsctplib/netinet/sctp_var.h',
         'usrsctplib/netinet6/sctp6_usrreq.c',
+        'usrsctplib/netinet6/sctp6_var.h',
       ],  # sources
       'conditions': [
         ['OS=="linux"', {
@@ -59,8 +124,8 @@
             'HAVE_SOCKET',
             '__Userspace_os_Linux',
           ],
-          'ccflags!': [ '-Werror', '-Wall' ],
-          'ccflags': [ '-w' ],
+          'cflags!': [ '-Werror', '-Wall' ],
+          'cflags': [ '-w' ],
         }],
         ['OS=="mac"', {
           'defines': [
@@ -77,7 +142,7 @@
           # TODO(ldixon): explore why gyp cflags here does not get picked up.
           'xcode_settings': {
             'OTHER_CFLAGS!': [ '-Werror', '-Wall' ],
-            'OTHER_CFLAGS': [ '-U__APPLE__', '-w' ],
+            'OTHER_CFLAGS': [ '-w' ],
           },
         }],
         ['OS=="win"', {
@@ -85,8 +150,10 @@
             'INET6',
             '__Userspace_os_Windows',
           ],
-          'ccflags!': [ '/W3', '/WX' ],
-          'ccflags': [ '/w' ],
+          'cflags!': [ '/W3', '/WX' ],
+          'cflags': [ '/w' ],
+          # TODO(ldixon) : Remove this disable.
+          'msvs_disabled_warnings': [ 4700, 4013, 4018, 4133 ],
         }, {  # OS != "win",
           'defines': [
             'NON_WINDOWS_DEFINE',