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

Side by Side Diff: content/content_renderer.gypi

Issue 21421002: Revert EVS revisions 209760, 298753, 213143. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased at 216225, prepare to land Created 7 years, 4 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 | « content/content_common.gypi ('k') | content/public/common/content_switches.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 '../jingle/jingle.gyp:jingle_glue', 7 '../jingle/jingle.gyp:jingle_glue',
8 '../media/media.gyp:media', 8 '../media/media.gyp:media',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 'renderer/media/peer_connection_identity_service.cc', 592 'renderer/media/peer_connection_identity_service.cc',
593 'renderer/media/peer_connection_identity_service.h', 593 'renderer/media/peer_connection_identity_service.h',
594 'renderer/media/peer_connection_tracker.cc', 594 'renderer/media/peer_connection_tracker.cc',
595 'renderer/media/peer_connection_tracker.h', 595 'renderer/media/peer_connection_tracker.h',
596 'renderer/media/remote_media_stream_impl.cc', 596 'renderer/media/remote_media_stream_impl.cc',
597 'renderer/media/remote_media_stream_impl.h', 597 'renderer/media/remote_media_stream_impl.h',
598 'renderer/media/rtc_data_channel_handler.cc', 598 'renderer/media/rtc_data_channel_handler.cc',
599 'renderer/media/rtc_data_channel_handler.h', 599 'renderer/media/rtc_data_channel_handler.h',
600 'renderer/media/rtc_dtmf_sender_handler.cc', 600 'renderer/media/rtc_dtmf_sender_handler.cc',
601 'renderer/media/rtc_dtmf_sender_handler.h', 601 'renderer/media/rtc_dtmf_sender_handler.h',
602 'renderer/media/rtc_encoding_video_capturer.cc',
603 'renderer/media/rtc_encoding_video_capturer.h',
604 'renderer/media/rtc_encoding_video_capturer_factory.cc',
605 'renderer/media/rtc_encoding_video_capturer_factory.h',
606 'renderer/media/rtc_media_constraints.cc', 602 'renderer/media/rtc_media_constraints.cc',
607 'renderer/media/rtc_media_constraints.h', 603 'renderer/media/rtc_media_constraints.h',
608 'renderer/media/rtc_peer_connection_handler.cc', 604 'renderer/media/rtc_peer_connection_handler.cc',
609 'renderer/media/rtc_peer_connection_handler.h', 605 'renderer/media/rtc_peer_connection_handler.h',
610 'renderer/media/rtc_video_capture_delegate.cc', 606 'renderer/media/rtc_video_capture_delegate.cc',
611 'renderer/media/rtc_video_capture_delegate.h', 607 'renderer/media/rtc_video_capture_delegate.h',
612 'renderer/media/rtc_video_capturer.cc', 608 'renderer/media/rtc_video_capturer.cc',
613 'renderer/media/rtc_video_capturer.h', 609 'renderer/media/rtc_video_capturer.h',
614 'renderer/media/rtc_video_decoder.cc', 610 'renderer/media/rtc_video_decoder.cc',
615 'renderer/media/rtc_video_decoder.h', 611 'renderer/media/rtc_video_decoder.h',
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 }], 694 }],
699 ], 695 ],
700 'target_conditions': [ 696 'target_conditions': [
701 ['OS=="android"', { 697 ['OS=="android"', {
702 'sources/': [ 698 'sources/': [
703 ['include', '^renderer/render_view_linux\\.cc$'], 699 ['include', '^renderer/render_view_linux\\.cc$'],
704 ], 700 ],
705 }], 701 }],
706 ], 702 ],
707 } 703 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698