summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandresp@webrtc.org <andresp@webrtc.org>2014-09-18 08:58:15 +0000
committerandresp@webrtc.org <andresp@webrtc.org>2014-09-18 08:58:15 +0000
commita31086e8999d58bfd3e9fdbfde5a5329f9c98acd (patch)
treef74595960ff0e5c9a398537b112462c1b0b5b5c4
parent5e89dbd355e720d82139013c5e56d005208d51c8 (diff)
downloadtalk-a31086e8999d58bfd3e9fdbfde5a5329f9c98acd.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/talk@7217 4adac7df-926f-26a2-2b94-8c16560cd09d
-rwxr-xr-xlibjingle.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libjingle.gyp b/libjingle.gyp
index 2814999..335a788 100755
--- a/libjingle.gyp
+++ b/libjingle.gyp
@@ -501,10 +501,12 @@
['build_with_chromium==1', {
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
+ '<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
],
}, {
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
+ '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
],
}],
['OS=="linux"', {