diff options
| author | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-18 08:58:15 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-18 08:58:15 +0000 |
| commit | 0ab271b4001169347867b4eeac3035e3442026f9 (patch) | |
| tree | 7f28b31cf004478e85291a55fdef5ea89243df26 /webrtc_tests.gypi | |
| parent | 2738d4793348b524b02c8fcc5fabd113d4971cbd (diff) | |
| download | webrtc-0ab271b4001169347867b4eeac3035e3442026f9.tar.gz | |
Split video_render_module implementation into default and internal implementation.
Targets must now link with implementation of their choice instead of at "gyp"-time.
Targets linking with libjingle_media:
- internal implementation when build_with_chromium=0, default otherwise.
Targets linking with default render implementation:
- video_engine_tests
- video_loopback
- video_replay
- anything dependent on webrtc_test_common
Targets linking with internal render implementation:
- vie_auto_test
- video_render_tests
- libwebrtcdemo-jni
- video_engine_core_unittests
GN changes:
- Not many since there is almost no test definitions.
Work-around for chromium:
- Until chromium has updated libpeerconnection to link with video_capture_impl and video_render_impl, webrtc target automatically depends on it. This should fix the FYI bots and not require a webrtc roll to fix.
Re-enable android tests by reverting 7026 (some tests left disabled).
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=3770
R=kjellander@webrtc.org, pbos@webrtc.org
TBR=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/19359004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7217 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc_tests.gypi')
| -rw-r--r-- | webrtc_tests.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 75849543..833fef9f 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -48,6 +48,7 @@ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/webrtc_test_common.gyp:webrtc_test_renderer', + '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', 'webrtc', ], @@ -71,9 +72,10 @@ 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - 'system_wrappers/source/system_wrappers.gyp:field_trial_default', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/webrtc_test_common.gyp:webrtc_test_renderer', + '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', + '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', 'webrtc', ], }, @@ -90,7 +92,8 @@ ], 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', - 'modules/modules.gyp:rtp_rtcp', + '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', + '<(webrtc_root)/modules/modules.gyp:video_render_module_impl', 'test/metrics.gyp:metrics', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/test.gyp:test_main', @@ -114,9 +117,6 @@ 'video/full_stack.cc', 'video/rampup_tests.cc', 'video/rampup_tests.h', - # Needed to make the test binary pass since all tests are disabled on - # Android (webrtc:3770). - 'test/testsupport/always_passing_unittest.cc', ], 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', |