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

Side by Side Diff: talk/libjingle_tests.gyp

Issue 1219663008: Remove media sinks from Channel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « talk/libjingle.gyp ('k') | talk/session/media/channel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 'libjingle_unittest_main', 149 'libjingle_unittest_main',
150 ], 150 ],
151 'include_dirs': [ 151 'include_dirs': [
152 '<(DEPTH)/third_party/libsrtp/srtp', 152 '<(DEPTH)/third_party/libsrtp/srtp',
153 ], 153 ],
154 'sources': [ 154 'sources': [
155 'session/media/bundlefilter_unittest.cc', 155 'session/media/bundlefilter_unittest.cc',
156 'session/media/channel_unittest.cc', 156 'session/media/channel_unittest.cc',
157 'session/media/channelmanager_unittest.cc', 157 'session/media/channelmanager_unittest.cc',
158 'session/media/currentspeakermonitor_unittest.cc', 158 'session/media/currentspeakermonitor_unittest.cc',
159 'session/media/mediarecorder_unittest.cc',
160 'session/media/mediasession_unittest.cc', 159 'session/media/mediasession_unittest.cc',
161 'session/media/rtcpmuxfilter_unittest.cc', 160 'session/media/rtcpmuxfilter_unittest.cc',
162 'session/media/srtpfilter_unittest.cc', 161 'session/media/srtpfilter_unittest.cc',
163 ], 162 ],
164 'conditions': [ 163 'conditions': [
165 ['build_libsrtp==1', { 164 ['build_libsrtp==1', {
166 'dependencies': [ 165 'dependencies': [
167 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', 166 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
168 ], 167 ],
169 }], 168 }],
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 'build/isolate.gypi', 432 'build/isolate.gypi',
434 ], 433 ],
435 'sources': [ 434 'sources': [
436 'libjingle_peerconnection_unittest.isolate', 435 'libjingle_peerconnection_unittest.isolate',
437 ], 436 ],
438 }, 437 },
439 ], 438 ],
440 }], 439 }],
441 ], 440 ],
442 } 441 }
OLDNEW
« no previous file with comments | « talk/libjingle.gyp ('k') | talk/session/media/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698