Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 16196007: Enable SCTP in libjingle. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | third_party/usrsctp/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp (revision 203404)
+++ third_party/libjingle/libjingle.gyp (working copy)
@@ -22,7 +22,6 @@
'HAVE_SRTP',
'HAVE_WEBRTC_VIDEO',
'HAVE_WEBRTC_VOICE',
- 'HAVE_YUV',
'JSONCPP_RELATIVE_PATH',
'LOGGING_INSIDE_LIBJINGLE',
'NO_MAIN_THREAD_WRAPPING',
@@ -45,6 +44,7 @@
'../../testing/gtest/include',
'../../third_party',
'../../third_party/libyuv/include',
+ '../../third_party/usrsctp',
'../../third_party/webrtc',
],
'dependencies': [
@@ -771,6 +771,19 @@
'overrides/allocator_shim/allocator_stub.h',
],
}],
+ #TODO(mallinath) - Investigate why this section can't be moved below.
Sergey Ulanov 2013/05/31 19:45:30 nit: add space before TODO. 80 chars lines. I don'
Mallinath (Gone from Chromium) 2013/05/31 21:17:30 Never mind, i was planning to insert these line @
+ ['OS!="android" and OS!="ios"', {
+ 'defines' : [
+ 'HAVE_SCTP',
+ ],
+ 'sources': [
+ '<(libjingle_source)/talk/media/sctp/sctpdataengine.cc',
+ '<(libjingle_source)/talk/media/sctp/sctpdataengine.h',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
+ ],
+ }],
['enabled_libjingle_device_manager==1', {
'sources!': [
'<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | third_party/usrsctp/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698