From b038c723696ecb00dde71f7b4ba626265cd7d4c2 Mon Sep 17 00:00:00 2001 From: "tkchin@webrtc.org" Date: Mon, 14 Jul 2014 20:24:09 +0000 Subject: [PATCH] Enable SCTP compile for iOS. Chromium's been updated to pull a version of usrsctplib that will compile correctly. This update DEPS to point at new revision and turn on the compile time flags for iOS sctp. BUG=3211 R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13929004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6681 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- talk/build/common.gypi | 5 +---- talk/libjingle.gyp | 7 ------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/DEPS b/DEPS index 9b5c2aa94a..0da9739b0a 100644 --- a/DEPS +++ b/DEPS @@ -166,7 +166,7 @@ deps = { Var("chromium_trunk") + "/src/third_party/usrsctp@" + Var("chromium_revision"), "third_party/usrsctp/usrsctplib": - (Var("googlecode_url") % "sctp-refimpl") + "/trunk/KERN/usrsctp/usrsctplib@8875", + From("chromium_deps", "src/third_party/usrsctp/usrsctplib"), } deps_os = { diff --git a/talk/build/common.gypi b/talk/build/common.gypi index 31ce66f5b3..24a975818a 100644 --- a/talk/build/common.gypi +++ b/talk/build/common.gypi @@ -67,6 +67,7 @@ 'FEATURE_ENABLE_PSTN', # TODO(eric): enable HAVE_NSS_SSL_H and SSL_USE_NSS once they are ready. # 'HAVE_NSS_SSL_H=1', + 'HAVE_SCTP', 'HAVE_SRTP', 'HAVE_WEBRTC_VIDEO', 'HAVE_WEBRTC_VOICE', @@ -107,10 +108,6 @@ 'defines': [ 'IOS', ], - }, { - 'defines': [ - 'HAVE_SCTP', - ], }], ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 'defines': [ diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 2182561e04..20d787ceec 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -1021,13 +1021,6 @@ # libjpeg which pulls in libyuv which currently disabled. '../third_party/libyuv/include', ], - 'dependencies!': [ - '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', - ], - 'sources!': [ - 'media/sctp/sctpdataengine.cc', - 'media/sctp/sctpdataengine.h', - ], }], ['OS=="android"', { 'sources': [