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

Side by Side Diff: content/content_renderer.gypi

Issue 381683003: Fix enable_webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add condition when enable_plugins = 1 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
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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 832 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
833 '../third_party/libyuv/libyuv.gyp:libyuv', 833 '../third_party/libyuv/libyuv.gyp:libyuv',
834 '../third_party/webrtc/modules/modules.gyp:audio_device', 834 '../third_party/webrtc/modules/modules.gyp:audio_device',
835 '../third_party/webrtc/modules/modules.gyp:audio_processing', 835 '../third_party/webrtc/modules/modules.gyp:audio_processing',
836 '<(DEPTH)/crypto/crypto.gyp:crypto', 836 '<(DEPTH)/crypto/crypto.gyp:crypto',
837 ], 837 ],
838 'sources': [ 838 'sources': [
839 '<@(public_renderer_webrtc_sources)', 839 '<@(public_renderer_webrtc_sources)',
840 '<@(private_renderer_webrtc_sources)', 840 '<@(private_renderer_webrtc_sources)',
841 ], 841 ],
842 },{ # enable_webrtc==0 842 },{ # enable_webrtc==0
pdr. 2014/07/12 02:34:48 There is an extra space at the end of the line her
843 'sources': [ 843 'sources': [
pdr. 2014/07/12 02:34:48 Please correct this indentation.
844 'renderer/media/webrtc_logging_noop.cc', 844 'renderer/media/webrtc_logging_noop.cc',
845 'renderer/media/webrtc_logging.h', 845 'renderer/media/webrtc_logging.h',
846 ], 846 ],
847 }], 847 }],
848 ['enable_webrtc==0 and enable_plugins==1',{
pdr. 2014/07/12 02:34:49 This is not indented properly.
849 'dependencies': [
850 '../third_party/libyuv/libyuv.gyp:libyuv',
851 ],
852 }],
848 ['enable_plugins==1', { 853 ['enable_plugins==1', {
849 'sources': [ 854 'sources': [
850 '<@(private_renderer_plugin_sources)', 855 '<@(private_renderer_plugin_sources)',
851 ], 856 ],
852 'dependencies': [ 857 'dependencies': [
853 '../ppapi/ppapi_internal.gyp:ppapi_host', 858 '../ppapi/ppapi_internal.gyp:ppapi_host',
854 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 859 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
855 '../ppapi/ppapi_internal.gyp:ppapi_shared', 860 '../ppapi/ppapi_internal.gyp:ppapi_shared',
856 ], 861 ],
857 }, { # enable_plugins==0 862 }, { # enable_plugins==0
(...skipping 24 matching lines...) Expand all
882 }], 887 }],
883 ], 888 ],
884 'target_conditions': [ 889 'target_conditions': [
885 ['OS=="android"', { 890 ['OS=="android"', {
886 'sources/': [ 891 'sources/': [
887 ['include', '^renderer/render_view_linux\\.cc$'], 892 ['include', '^renderer/render_view_linux\\.cc$'],
888 ], 893 ],
889 }], 894 }],
890 ], 895 ],
891 } 896 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698