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

Side by Side Diff: content/content_renderer.gypi

Issue 364003003: Fix default video decoder issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unrelated change Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_video_decoder_host.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 'content_common_mojo_bindings', 7 'content_common_mojo_bindings',
8 '../base/base.gyp:base', 8 '../base/base.gyp:base',
9 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 9 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
10 '../cc/cc.gyp:cc', 10 '../cc/cc.gyp:cc',
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 },{ # enable_webrtc==0 833 },{ # enable_webrtc==0
834 'sources': [ 834 'sources': [
835 'renderer/media/webrtc_logging_noop.cc', 835 'renderer/media/webrtc_logging_noop.cc',
836 'renderer/media/webrtc_logging.h', 836 'renderer/media/webrtc_logging.h',
837 ], 837 ],
838 }], 838 }],
839 ['enable_plugins==1', { 839 ['enable_plugins==1', {
840 'sources': [ 840 'sources': [
841 '<@(private_renderer_plugin_sources)', 841 '<@(private_renderer_plugin_sources)',
842 ], 842 ],
843 'conditions': [
844 ['OS=="android"', {
845 'sources!': [
846 # Android does not build FFmpeg, which these depend on.
847 'renderer/pepper/video_decoder_shim.cc',
848 'renderer/pepper/video_decoder_shim.h',
849 ],
850 }],
851 ],
843 'dependencies': [ 852 'dependencies': [
844 '../ppapi/ppapi_internal.gyp:ppapi_host', 853 '../ppapi/ppapi_internal.gyp:ppapi_host',
845 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 854 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
846 '../ppapi/ppapi_internal.gyp:ppapi_shared', 855 '../ppapi/ppapi_internal.gyp:ppapi_shared',
847 ], 856 ],
848 }, { # enable_plugins==0 857 }, { # enable_plugins==0
849 'sources!': [ 858 'sources!': [
850 # These are not in the plugins sources list since it also requires webrt c. 859 # These are not in the plugins sources list since it also requires webrt c.
851 'renderer/media/webrtc/video_destination_handler.cc', 860 'renderer/media/webrtc/video_destination_handler.cc',
852 'renderer/media/webrtc/video_destination_handler.h', 861 'renderer/media/webrtc/video_destination_handler.h',
(...skipping 20 matching lines...) Expand all
873 }], 882 }],
874 ], 883 ],
875 'target_conditions': [ 884 'target_conditions': [
876 ['OS=="android"', { 885 ['OS=="android"', {
877 'sources/': [ 886 'sources/': [
878 ['include', '^renderer/render_view_linux\\.cc$'], 887 ['include', '^renderer/render_view_linux\\.cc$'],
879 ], 888 ],
880 }], 889 }],
881 ], 890 ],
882 } 891 }
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_video_decoder_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698