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': [