Index: webrtc/media/BUILD.gn |
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn |
index 6f4a7c8d05c26d9ba6ad32a888c915432c407e5d..3abdb44880a7ad5032ef19dd584fb4196666c422 100644 |
--- a/webrtc/media/BUILD.gn |
+++ b/webrtc/media/BUILD.gn |
@@ -99,19 +99,25 @@ rtc_static_library("rtc_media_base") { |
deps += [ |
"..:webrtc_common", |
"../api:libjingle_peerconnection_api", |
- "../api:video_frame_api", |
"../api/audio_codecs:audio_codecs_api", |
- "../api/audio_codecs:builtin_audio_encoder_factory", |
"../base:rtc_base", |
"../base:rtc_base_approved", |
"../call:call_interfaces", |
- "../common_video:common_video", |
"../p2p", |
] |
if (is_nacl) { |
deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
} |
+ |
+ if (rtc_enable_media) { |
+ deps += [ |
+ "../api:video_frame_api", |
+ "../api/audio_codecs:builtin_audio_encoder_factory", |
+ "../common_video:common_video", |
+ "../modules/audio_coding:builtin_audio_encoder_factory", |
+ ] |
+ } |
} |
rtc_static_library("rtc_media") { |
@@ -126,39 +132,9 @@ rtc_static_library("rtc_media") { |
libs = [] |
deps = [] |
sources = [ |
- "engine/adm_helpers.cc", |
- "engine/adm_helpers.h", |
- "engine/apm_helpers.cc", |
- "engine/apm_helpers.h", |
- "engine/internaldecoderfactory.cc", |
- "engine/internaldecoderfactory.h", |
- "engine/internalencoderfactory.cc", |
- "engine/internalencoderfactory.h", |
- "engine/nullwebrtcvideoengine.h", |
- "engine/payload_type_mapper.cc", |
- "engine/payload_type_mapper.h", |
- "engine/simulcast.cc", |
- "engine/simulcast.h", |
- "engine/videodecodersoftwarefallbackwrapper.cc", |
- "engine/videodecodersoftwarefallbackwrapper.h", |
- "engine/videoencodersoftwarefallbackwrapper.cc", |
- "engine/videoencodersoftwarefallbackwrapper.h", |
- "engine/webrtccommon.h", |
- "engine/webrtcmediaengine.cc", |
- "engine/webrtcmediaengine.h", |
- "engine/webrtcvideocapturer.cc", |
- "engine/webrtcvideocapturer.h", |
- "engine/webrtcvideocapturerfactory.cc", |
- "engine/webrtcvideocapturerfactory.h", |
"engine/webrtcvideodecoderfactory.h", |
"engine/webrtcvideoencoderfactory.cc", |
"engine/webrtcvideoencoderfactory.h", |
Taylor Brandstetter
2017/05/03 22:50:57
What would it take to move these files into the "i
Zhi Huang
2017/05/04 01:08:02
The dependency chain is:
peerconnection_integratio
pthatcher1
2017/05/05 01:45:12
If they do, it will be really easy to know and fix
|
- "engine/webrtcvideoengine2.cc", |
- "engine/webrtcvideoengine2.h", |
- "engine/webrtcvideoframe.h", |
- "engine/webrtcvoe.h", |
- "engine/webrtcvoiceengine.cc", |
- "engine/webrtcvoiceengine.h", |
"sctp/sctptransportinternal.h", |
] |
@@ -228,28 +204,66 @@ rtc_static_library("rtc_media") { |
"..:webrtc_common", |
"../api:call_api", |
"../api:transport_api", |
- "../api:video_frame_api", |
"../api/audio_codecs:audio_codecs_api", |
- "../api/audio_codecs:builtin_audio_decoder_factory", |
"../api/video_codecs:video_codecs_api", |
"../base:rtc_base", |
"../base:rtc_base_approved", |
- "../call", |
- "../common_video:common_video", |
- "../modules/audio_coding:rent_a_codec", |
- "../modules/audio_device:audio_device", |
- "../modules/audio_mixer:audio_mixer_impl", |
- "../modules/audio_processing:audio_processing", |
- "../modules/video_capture:video_capture_module", |
- "../modules/video_coding", |
- "../modules/video_coding:webrtc_h264", |
- "../modules/video_coding:webrtc_vp8", |
- "../modules/video_coding:webrtc_vp9", |
"../p2p:rtc_p2p", |
"../system_wrappers", |
- "../video", |
- "../voice_engine", |
] |
+ |
+ if (rtc_enable_media) { |
+ sources += [ |
+ "engine/adm_helpers.cc", |
+ "engine/adm_helpers.h", |
+ "engine/apm_helpers.cc", |
+ "engine/apm_helpers.h", |
+ "engine/internaldecoderfactory.cc", |
+ "engine/internaldecoderfactory.h", |
+ "engine/internalencoderfactory.cc", |
+ "engine/internalencoderfactory.h", |
+ "engine/nullwebrtcvideoengine.h", |
+ "engine/payload_type_mapper.cc", |
+ "engine/payload_type_mapper.h", |
+ "engine/simulcast.cc", |
+ "engine/simulcast.h", |
+ "engine/videodecodersoftwarefallbackwrapper.cc", |
+ "engine/videodecodersoftwarefallbackwrapper.h", |
+ "engine/videoencodersoftwarefallbackwrapper.cc", |
+ "engine/videoencodersoftwarefallbackwrapper.h", |
+ "engine/webrtccommon.h", |
+ "engine/webrtcmediaengine.cc", |
+ "engine/webrtcmediaengine.h", |
+ "engine/webrtcvideocapturer.cc", |
+ "engine/webrtcvideocapturer.h", |
+ "engine/webrtcvideocapturerfactory.cc", |
+ "engine/webrtcvideocapturerfactory.h", |
+ "engine/webrtcvideoengine2.cc", |
+ "engine/webrtcvideoengine2.h", |
+ "engine/webrtcvideoframe.h", |
+ "engine/webrtcvoe.h", |
+ "engine/webrtcvoiceengine.cc", |
+ "engine/webrtcvoiceengine.h", |
+ ] |
+ |
+ deps += [ |
+ "../api:video_frame_api", |
+ "../api/audio_codecs:builtin_audio_decoder_factory", |
+ "../call", |
+ "../common_video:common_video", |
+ "../modules/audio_coding:rent_a_codec", |
+ "../modules/audio_device:audio_device", |
+ "../modules/audio_mixer:audio_mixer_impl", |
+ "../modules/audio_processing:audio_processing", |
+ "../modules/video_capture:video_capture_module", |
+ "../modules/video_coding", |
+ "../modules/video_coding:webrtc_h264", |
+ "../modules/video_coding:webrtc_vp8", |
+ "../modules/video_coding:webrtc_vp9", |
+ "../video", |
+ "../voice_engine", |
+ ] |
+ } |
} |
if (rtc_include_tests) { |
@@ -316,7 +330,7 @@ if (rtc_include_tests) { |
"../base:rtc_base", |
"../base:rtc_base_approved", |
"../base:rtc_base_tests_utils", |
- "../call:call_interfaces", |
+ "../call", |
"../test:test_support", |
"//testing/gtest", |
] |
@@ -443,9 +457,6 @@ if (rtc_include_tests) { |
":rtc_media", |
":rtc_media_base", |
":rtc_media_tests_utils", |
- "../api:video_frame_api", |
- "../api/audio_codecs:builtin_audio_decoder_factory", |
- "../api/audio_codecs:builtin_audio_encoder_factory", |
"../api/video_codecs:video_codecs_api", |
"../audio", |
"../base:rtc_base", |
@@ -453,11 +464,8 @@ if (rtc_include_tests) { |
"../base:rtc_base_tests_main", |
"../base:rtc_base_tests_utils", |
"../call:call_interfaces", |
- "../common_video:common_video", |
"../logging:rtc_event_log_api", |
"../modules/audio_device:mock_audio_device", |
- "../modules/audio_processing:audio_processing", |
- "../modules/video_coding:video_coding_utility", |
"../modules/video_coding:webrtc_vp8", |
"../p2p:p2p_test_utils", |
"../system_wrappers:metrics_default", |
@@ -465,5 +473,16 @@ if (rtc_include_tests) { |
"../test:test_support", |
"../voice_engine:voice_engine", |
] |
+ |
+ if (rtc_enable_media) { |
+ deps += [ |
+ "../api:video_frame_api", |
+ "../api/audio_codecs:builtin_audio_decoder_factory", |
+ "../api/audio_codecs:builtin_audio_encoder_factory", |
+ "../common_video:common_video", |
+ "../modules/audio_processing:audio_processing", |
+ "../modules/video_coding:video_coding_utility", |
+ ] |
+ } |
} |
} |