summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 23:00:06 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 23:00:06 +0000
commit9eed7da08c36b10c5d2d46fb8914e9f913f87335 (patch)
tree6f9b8cf12dd564ee9b4dfbe20a79d0b23a11560d
parent59e0c35e54baf4486867b33eb3bfb4bc78967e8c (diff)
downloadchromium_src-9eed7da08c36b10c5d2d46fb8914e9f913f87335.zip
chromium_src-9eed7da08c36b10c5d2d46fb8914e9f913f87335.tar.gz
chromium_src-9eed7da08c36b10c5d2d46fb8914e9f913f87335.tar.bz2
Put rtc_media_constraints.* under flag enable_webrtc=1.
Some platforms still have enable_webrtc=0 which will disable all webrtc related code including WebKit. TEST=build and run chrome with enable_webrtc=0 or 1. Review URL: https://codereview.chromium.org/11642029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174026 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/content_renderer.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 3c6db0d..d70c05f 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -140,8 +140,6 @@
'renderer/media/renderer_gpu_video_decoder_factories.h',
'renderer/media/renderer_webaudiodevice_impl.cc',
'renderer/media/renderer_webaudiodevice_impl.h',
- 'renderer/media/rtc_media_constraints.cc',
- 'renderer/media/rtc_media_constraints.h',
'renderer/media/rtc_video_decoder.cc',
'renderer/media/rtc_video_decoder.h',
'renderer/media/rtc_video_renderer.cc',
@@ -352,6 +350,8 @@
'renderer/media/peer_connection_handler_base.h',
'renderer/media/rtc_data_channel_handler.cc',
'renderer/media/rtc_data_channel_handler.h',
+ 'renderer/media/rtc_media_constraints.cc',
+ 'renderer/media/rtc_media_constraints.h',
'renderer/media/rtc_peer_connection_handler.cc',
'renderer/media/rtc_peer_connection_handler.h',
'renderer/media/rtc_video_capture_delegate.cc',