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

Unified Diff: content/renderer/BUILD.gn

Issue 2287263003: Fix build failure with "enable_webrtc = false". (Closed)
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/renderer/BUILD.gn ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/BUILD.gn
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 02e4ed96584fdbaee3e3b4c364e30aa8bf684f7e..c3812800436ecdcbdb27c555bc68f9ec0cf16168 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -238,30 +238,8 @@ target(link_target_type, "renderer") {
"media/cdm/ppapi_decryptor.h",
"media/cdm/render_cdm_factory.cc",
"media/cdm/render_cdm_factory.h",
- "media/external_media_stream_audio_source.cc",
- "media/external_media_stream_audio_source.h",
- "media/html_audio_element_capturer_source.cc",
- "media/html_audio_element_capturer_source.h",
- "media/local_media_stream_audio_source.cc",
- "media/local_media_stream_audio_source.h",
"media/media_permission_dispatcher.cc",
"media/media_permission_dispatcher.h",
- "media/media_stream_audio_deliverer.h",
- "media/media_stream_audio_level_calculator.cc",
- "media/media_stream_audio_level_calculator.h",
- "media/media_stream_audio_source.cc",
- "media/media_stream_audio_source.h",
- "media/media_stream_audio_track.cc",
- "media/media_stream_audio_track.h",
- "media/media_stream_center.h",
- "media/media_stream_constraints_util.cc",
- "media/media_stream_constraints_util.h",
- "media/media_stream_dispatcher.h",
- "media/media_stream_dispatcher_eventhandler.h",
- "media/media_stream_source.cc",
- "media/media_stream_source.h",
- "media/media_stream_track.cc",
- "media/media_stream_track.h",
"media/midi_message_filter.cc",
"media/midi_message_filter.h",
"media/render_media_client.cc",
@@ -284,8 +262,6 @@ target(link_target_type, "renderer") {
"media/video_capture_message_filter.h",
"media/web_media_element_source_utils.cc",
"media/web_media_element_source_utils.h",
- "media/webaudio_media_stream_source.cc",
- "media/webaudio_media_stream_source.h",
"media/webmediaplayer_ms.cc",
"media/webmediaplayer_ms.h",
"media/webmediaplayer_ms_compositor.cc",
@@ -537,25 +513,6 @@ target(link_target_type, "renderer") {
]
}
- # TODO(jrg): remove the OS=="android" section?
- # http://crbug.com/113172
- # Understand better how media_stream_ is tied into Chromium.
- if (!enable_webrtc && is_android) {
- sources -= [
- "media/media_stream_audio_level_calculator.cc",
- "media/media_stream_audio_level_calculator.h",
- "media/media_stream_audio_track.cc",
- "media/media_stream_audio_track.h",
- "media/media_stream_center.h",
- "media/media_stream_constraints_util.cc",
- "media/media_stream_constraints_util.h",
- "media/media_stream_dispatcher.h",
- "media/media_stream_dispatcher_eventhandler.h",
- "media/media_stream_track.cc",
- "media/media_stream_track.h",
- ]
- }
-
if (enable_webrtc) {
# WebRTC plugin-related stuff goes in a different section below.
sources += [
@@ -565,6 +522,8 @@ target(link_target_type, "renderer") {
"media/audio_track_recorder.h",
"media/canvas_capture_handler.cc",
"media/canvas_capture_handler.h",
+ "media/external_media_stream_audio_source.cc",
+ "media/external_media_stream_audio_source.h",
"media/gpu/rtc_video_decoder.cc",
"media/gpu/rtc_video_decoder.h",
"media/gpu/rtc_video_decoder_factory.cc",
@@ -573,23 +532,43 @@ target(link_target_type, "renderer") {
"media/gpu/rtc_video_encoder.h",
"media/gpu/rtc_video_encoder_factory.cc",
"media/gpu/rtc_video_encoder_factory.h",
+ "media/html_audio_element_capturer_source.cc",
+ "media/html_audio_element_capturer_source.h",
"media/html_video_element_capturer_source.cc",
"media/html_video_element_capturer_source.h",
"media/image_capture_frame_grabber.cc",
"media/image_capture_frame_grabber.h",
+ "media/local_media_stream_audio_source.cc",
+ "media/local_media_stream_audio_source.h",
"media/media_recorder_handler.cc",
"media/media_recorder_handler.h",
"media/media_stream.cc",
"media/media_stream.h",
+ "media/media_stream_audio_deliverer.h",
+ "media/media_stream_audio_level_calculator.cc",
+ "media/media_stream_audio_level_calculator.h",
"media/media_stream_audio_processor.cc",
"media/media_stream_audio_processor.h",
"media/media_stream_audio_processor_options.cc",
"media/media_stream_audio_processor_options.h",
+ "media/media_stream_audio_source.cc",
+ "media/media_stream_audio_source.h",
+ "media/media_stream_audio_track.cc",
+ "media/media_stream_audio_track.h",
"media/media_stream_center.cc",
+ "media/media_stream_center.h",
+ "media/media_stream_constraints_util.cc",
+ "media/media_stream_constraints_util.h",
"media/media_stream_dispatcher.cc",
+ "media/media_stream_dispatcher.h",
+ "media/media_stream_dispatcher_eventhandler.h",
"media/media_stream_registry_interface.h",
"media/media_stream_renderer_factory_impl.cc",
"media/media_stream_renderer_factory_impl.h",
+ "media/media_stream_source.cc",
+ "media/media_stream_source.h",
+ "media/media_stream_track.cc",
+ "media/media_stream_track.h",
"media/media_stream_video_capturer_source.cc",
"media/media_stream_video_capturer_source.h",
"media/media_stream_video_renderer_sink.cc",
@@ -622,6 +601,8 @@ target(link_target_type, "renderer") {
"media/video_track_adapter.h",
"media/video_track_recorder.cc",
"media/video_track_recorder.h",
+ "media/webaudio_media_stream_source.cc",
+ "media/webaudio_media_stream_source.h",
"media/webrtc/media_stream_remote_video_source.cc",
"media/webrtc/media_stream_remote_video_source.h",
"media/webrtc/media_stream_track_metrics.cc",
« no previous file with comments | « content/public/renderer/BUILD.gn ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698