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

Side by Side Diff: content/content_renderer.gypi

Issue 11187053: Merge 162055 - Enable peerconnection to use the NSS RNG. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../jingle/jingle.gyp:jingle_glue', 7 '../jingle/jingle.gyp:jingle_glue',
8 '../net/net.gyp:net', 8 '../net/net.gyp:net',
9 '../ppapi/ppapi_internal.gyp:ppapi_host', 9 '../ppapi/ppapi_internal.gyp:ppapi_host',
10 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 10 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 ['exclude', '^renderer/media/media_stream_'], 308 ['exclude', '^renderer/media/media_stream_'],
309 ], 309 ],
310 }], 310 }],
311 ['enable_webrtc==1', { 311 ['enable_webrtc==1', {
312 'dependencies': [ 312 'dependencies': [
313 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection', 313 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
314 '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system _wrappers', 314 '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system _wrappers',
315 '../third_party/webrtc/modules/modules.gyp:audio_device', 315 '../third_party/webrtc/modules/modules.gyp:audio_device',
316 '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', 316 '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
317 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', 317 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
318 '<(DEPTH)/crypto/crypto.gyp:crypto',
318 ], 319 ],
319 'sources': [ 320 'sources': [
320 'renderer/media/media_stream_center.cc', 321 'renderer/media/media_stream_center.cc',
321 'renderer/media/media_stream_dependency_factory.cc', 322 'renderer/media/media_stream_dependency_factory.cc',
322 'renderer/media/media_stream_dispatcher.cc', 323 'renderer/media/media_stream_dispatcher.cc',
323 'renderer/media/media_stream_impl.cc', 324 'renderer/media/media_stream_impl.cc',
324 'renderer/media/peer_connection_handler_base.cc', 325 'renderer/media/peer_connection_handler_base.cc',
325 'renderer/media/peer_connection_handler_base.h', 326 'renderer/media/peer_connection_handler_base.h',
326 'renderer/media/peer_connection_handler_jsep.cc', 327 'renderer/media/peer_connection_handler_jsep.cc',
327 'renderer/media/peer_connection_handler_jsep.h', 328 'renderer/media/peer_connection_handler_jsep.h',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 }], 362 }],
362 ], 363 ],
363 'target_conditions': [ 364 'target_conditions': [
364 ['OS=="android"', { 365 ['OS=="android"', {
365 'sources/': [ 366 'sources/': [
366 ['include', '^renderer/render_view_linux\\.cc$'], 367 ['include', '^renderer/render_view_linux\\.cc$'],
367 ], 368 ],
368 }], 369 }],
369 ], 370 ],
370 } 371 }
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698