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

Side by Side Diff: talk/libjingle.gyp

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make the test target inherit the defines for rtc_pc Created 4 years, 10 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
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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 '-framework Cocoa', 181 '-framework Cocoa',
182 ], 182 ],
183 }, 183 },
184 }, 184 },
185 }], 185 }],
186 ], 186 ],
187 }, # target libjingle_peerconnection_objc 187 }, # target libjingle_peerconnection_objc
188 ], 188 ],
189 }], 189 }],
190 ], 190 ],
191 'targets': [
192 {
193 'target_name': 'libjingle_p2p',
194 'type': 'static_library',
195 'dependencies': [
196 '<(webrtc_root)/base/base.gyp:rtc_base',
197 '<(webrtc_root)/media/media.gyp:rtc_media',
198 ],
199 'conditions': [
200 ['build_libsrtp==1', {
201 'dependencies': [
202 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
203 ],
204 }],
205 ],
206 'include_dirs': [
207 '<(DEPTH)/testing/gtest/include',
208 ],
209 'include_dirs!': [
210 '<(DEPTH)/webrtc',
211 ],
212 'direct_dependent_settings': {
213 'include_dirs': [
214 '<(DEPTH)/testing/gtest/include',
215 ],
216 'include_dirs!': [
217 '<(DEPTH)/webrtc',
218 ],
219 },
220 'sources': [
221 'session/media/audiomonitor.cc',
222 'session/media/audiomonitor.h',
223 'session/media/bundlefilter.cc',
224 'session/media/bundlefilter.h',
225 'session/media/channel.cc',
226 'session/media/channel.h',
227 'session/media/channelmanager.cc',
228 'session/media/channelmanager.h',
229 'session/media/currentspeakermonitor.cc',
230 'session/media/currentspeakermonitor.h',
231 'session/media/mediamonitor.cc',
232 'session/media/mediamonitor.h',
233 'session/media/mediasession.cc',
234 'session/media/mediasession.h',
235 'session/media/mediasink.h',
236 'session/media/rtcpmuxfilter.cc',
237 'session/media/rtcpmuxfilter.h',
238 'session/media/srtpfilter.cc',
239 'session/media/srtpfilter.h',
240 'session/media/voicechannel.h',
241 ],
242 }, # target libjingle_p2p
243 ],
244 } 191 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698