diff options
| author | kjellander <kjellander@chromium.org> | 2016-03-20 13:27:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-20 20:29:57 +0000 |
| commit | 204a61eab34238e41beacdbcf2ca612edd160d85 (patch) | |
| tree | 0b800af666b0ba6329bc404fc9351c6ac7ba36be /third_party/libjingle | |
| parent | 5722b4604362b85719ec7ebbc89f0eb904160dd3 (diff) | |
| download | chromium_src-204a61eab34238e41beacdbcf2ca612edd160d85.zip chromium_src-204a61eab34238e41beacdbcf2ca612edd160d85.tar.gz chromium_src-204a61eab34238e41beacdbcf2ca612edd160d85.tar.bz2 | |
Enable SCTP for iOS
This is one small piece in the effort of eliminating
the third_party/libjingle/libjingle.gyp in Chromium
and replace it with GYP files in third_party/webrtc.
The previous condition wasn't really needed since
enable_webrtc==0 for iOS in Chromium by default.
BUG=webrtc:4256
Review URL: https://codereview.chromium.org/1806343002
Cr-Commit-Position: refs/heads/master@{#382232}
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index e4a82a7..69021f4 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -21,6 +21,7 @@ 'FEATURE_ENABLE_SSL', 'GTEST_RELATIVE_PATH', 'HAVE_OPENSSL_SSL_H', + 'HAVE_SCTP', 'HAVE_SRTP', 'HAVE_WEBRTC_VIDEO', 'HAVE_WEBRTC_VOICE', @@ -340,6 +341,8 @@ '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.cc', '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.h', '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoe.h', + '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.cc', + '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.h', '<(DEPTH)/third_party/webrtc/pc/audiomonitor.cc', '<(DEPTH)/third_party/webrtc/pc/audiomonitor.h', '<(DEPTH)/third_party/webrtc/pc/bundlefilter.cc', @@ -363,23 +366,9 @@ '<(DEPTH)/third_party/webrtc/pc/srtpfilter.h', '<(DEPTH)/third_party/webrtc/pc/voicechannel.h', ], - 'conditions': [ - # TODO(mallinath) - Enable SCTP for iOS. - ['OS!="ios"', { - 'defines': [ - 'HAVE_SCTP', - ], - 'sources': [ - '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.cc', - '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.h', - ], - 'dependencies': [ - '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', - ], - }], - ], 'dependencies': [ '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', + '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file', '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture', '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render', |