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 | 6739a00f48db57ba66156d7f8305a13332eca62e (patch) | |
| tree | 23e7c32854fd68e1985bd4c3641bdd520923eb58 | |
| parent | 19eb91c9613929dbaa5b1381d6c897f45854bb41 (diff) | |
| download | talk-6739a00f48db57ba66156d7f8305a13332eca62e.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/talk@7209 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rwxr-xr-x | libjingle.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libjingle.gyp b/libjingle.gyp index 9b5ac59..2814999 100755 --- a/libjingle.gyp +++ b/libjingle.gyp @@ -396,7 +396,6 @@ 'dependencies': [ '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', - '<(webrtc_root)/modules/modules.gyp:video_capture_module', '<(webrtc_root)/modules/modules.gyp:video_render_module', '<(webrtc_root)/webrtc.gyp:webrtc', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', @@ -499,6 +498,15 @@ 'media/webrtc/webrtcvoiceengine.h', ], 'conditions': [ + ['build_with_chromium==1', { + 'dependencies': [ + '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl', + ], + }, { + 'dependencies': [ + '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl', + ], + }], ['OS=="linux"', { 'sources': [ 'media/devices/gtkvideorenderer.cc', |