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 /video_engine/test | |
| 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 'video_engine/test')
| -rw-r--r-- | video_engine/test/auto_test/vie_auto_test.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video_engine/test/auto_test/vie_auto_test.gypi b/video_engine/test/auto_test/vie_auto_test.gypi index 96291660..60290849 100644 --- a/video_engine/test/auto_test/vie_auto_test.gypi +++ b/video_engine/test/auto_test/vie_auto_test.gypi @@ -15,7 +15,7 @@ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', '<(webrtc_root)/modules/modules.gyp:video_render_module', - '<(webrtc_root)/modules/modules.gyp:video_capture_module', + '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |