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
This commit is contained in:
tkchin@webrtc.org
2014-07-14 20:24:09 +00:00
parent aac14973aa
commit b038c72369
3 changed files with 2 additions and 12 deletions

View File

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

View File

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