diff options
| author | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-17 11:50:19 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-17 11:50:19 +0000 |
| commit | 36e363e0aabab232f7fe2e94a104a72c8a7e6c92 (patch) | |
| tree | 90ddcbbd9f8517e523aa30a46caec15cc589b261 /build | |
| parent | 8d6e944bee3e0228ca0e52e23fabea8ed787d5ec (diff) | |
| download | webrtc-36e363e0aabab232f7fe2e94a104a72c8a7e6c92.tar.gz | |
Split video_capture_module specific implementation (external vs internal capture)
into its own targets. Dependencies must link directly with the desired one.
Targets linking with libjingle_media:
- internal implementation when build_with_chromium=0, default otherwise.
Targets linking with default/external capture implementation:
- anything dependent on webrtc_test_common
- anything dependent on video_engine_core
Targets linking with internal capture implementation:
- vie_auto_test
- anything dependent on webrtc_test_renderer
GN changes:
- Not many since there is almost no test definitions.
TESTED: passes all the bots. If this inadvertently breaks a target please fix the linking rules so the target has the desired implementation linked in.
BUG=3768
R=glaznev@webrtc.org
TBR=kjellander@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/24589004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7209 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | build/webrtc.gni | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4b17eb4d..72876009 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -132,9 +132,6 @@ # Exclude internal ADM since Chromium uses its own IO handling. 'include_internal_audio_device%': 0, - # Exclude internal VCM in Chromium build. - 'include_internal_video_capture%': 0, - # Exclude internal video render module in Chromium build. 'include_internal_video_render%': 0, }, { # Settings for the standalone (not-in-Chromium) build. @@ -145,7 +142,6 @@ 'include_pulse_audio%': 1, 'include_internal_audio_device%': 1, - 'include_internal_video_capture%': 1, 'include_internal_video_render%': 1, }], ['build_with_libjingle==1', { diff --git a/build/webrtc.gni b/build/webrtc.gni index d46b8c64..5e3adfaa 100644 --- a/build/webrtc.gni +++ b/build/webrtc.gni @@ -74,9 +74,6 @@ declare_args() { # Exclude internal ADM since Chromium uses its own IO handling. rtc_include_internal_audio_device = false - # Exclude internal VCM in Chromium build. - rtc_include_internal_video_capture = false - # Exclude internal video render module in Chromium build. rtc_include_internal_video_render = false } else { @@ -89,7 +86,6 @@ declare_args() { rtc_include_pulse_audio = true rtc_include_internal_audio_device = true - rtc_include_internal_video_capture = true rtc_include_internal_video_render = true } |