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

Side by Side Diff: content/content_renderer.gypi

Issue 1067803002: Roll WebRTC 8931:8933, Libjingle 8930:8932 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove NativeHandleImpl Created 5 years, 8 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 | « DEPS ('k') | content/renderer/media/native_handle_impl.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 # 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 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 8 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
9 '../cc/cc.gyp:cc', 9 '../cc/cc.gyp:cc',
10 '../cc/blink/cc_blink.gyp:cc_blink', 10 '../cc/blink/cc_blink.gyp:cc_blink',
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 'renderer/media/media_stream_renderer_factory.cc', 619 'renderer/media/media_stream_renderer_factory.cc',
620 'renderer/media/media_stream_renderer_factory.h', 620 'renderer/media/media_stream_renderer_factory.h',
621 'renderer/media/media_stream_source.cc', 621 'renderer/media/media_stream_source.cc',
622 'renderer/media/media_stream_source.h', 622 'renderer/media/media_stream_source.h',
623 'renderer/media/media_stream_video_capturer_source.cc', 623 'renderer/media/media_stream_video_capturer_source.cc',
624 'renderer/media/media_stream_video_capturer_source.h', 624 'renderer/media/media_stream_video_capturer_source.h',
625 'renderer/media/media_stream_video_source.cc', 625 'renderer/media/media_stream_video_source.cc',
626 'renderer/media/media_stream_video_source.h', 626 'renderer/media/media_stream_video_source.h',
627 'renderer/media/media_stream_video_track.cc', 627 'renderer/media/media_stream_video_track.cc',
628 'renderer/media/media_stream_video_track.h', 628 'renderer/media/media_stream_video_track.h',
629 'renderer/media/native_handle_impl.cc',
630 'renderer/media/native_handle_impl.h',
631 'renderer/media/peer_connection_identity_service.cc', 629 'renderer/media/peer_connection_identity_service.cc',
632 'renderer/media/peer_connection_identity_service.h', 630 'renderer/media/peer_connection_identity_service.h',
633 'renderer/media/peer_connection_tracker.cc', 631 'renderer/media/peer_connection_tracker.cc',
634 'renderer/media/peer_connection_tracker.h', 632 'renderer/media/peer_connection_tracker.h',
635 'renderer/media/remote_media_stream_impl.cc', 633 'renderer/media/remote_media_stream_impl.cc',
636 'renderer/media/remote_media_stream_impl.h', 634 'renderer/media/remote_media_stream_impl.h',
637 'renderer/media/rtc_data_channel_handler.cc', 635 'renderer/media/rtc_data_channel_handler.cc',
638 'renderer/media/rtc_data_channel_handler.h', 636 'renderer/media/rtc_data_channel_handler.h',
639 'renderer/media/rtc_dtmf_sender_handler.cc', 637 'renderer/media/rtc_dtmf_sender_handler.cc',
640 'renderer/media/rtc_dtmf_sender_handler.h', 638 'renderer/media/rtc_dtmf_sender_handler.h',
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 }], 863 }],
866 ], 864 ],
867 'target_conditions': [ 865 'target_conditions': [
868 ['OS=="android"', { 866 ['OS=="android"', {
869 'sources/': [ 867 'sources/': [
870 ['include', '^renderer/render_view_linux\\.cc$'], 868 ['include', '^renderer/render_view_linux\\.cc$'],
871 ], 869 ],
872 }], 870 }],
873 ], 871 ],
874 } 872 }
OLDNEW
« no previous file with comments | « DEPS ('k') | content/renderer/media/native_handle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698