summaryrefslogtreecommitdiffstats
path: root/content/content_tests.gypi
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 14:03:56 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 14:03:56 +0000
commit4ae4272a09df5dcff1cd46135b6955c2ced39686 (patch)
tree176cf66156ec065e5c612ef3448e60adaf7e7ace /content/content_tests.gypi
parent7fe819d1176ade01bd98f40556d894d7dff38276 (diff)
downloadchromium_src-4ae4272a09df5dcff1cd46135b6955c2ced39686.zip
chromium_src-4ae4272a09df5dcff1cd46135b6955c2ced39686.tar.gz
chromium_src-4ae4272a09df5dcff1cd46135b6955c2ced39686.tar.bz2
Split the libpeerconnection target up in two parts. The new target, libjingle_webrtc contains all the webrtc parts except for the media engine implementation. The media engine implementation stays in libpeerconnection and will be built as a shared library when component==shared_library. Since libjingle_webrtc contains the code that depends on libpeerconnection, those targets that previously only depended on libpeerconnection have been updated to include on libjingle_webrtc as well.
TBR=darin Review URL: https://codereview.chromium.org/12965010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
-rw-r--r--content/content_tests.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 6f6bf82..cd362a5 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -198,6 +198,7 @@
'test/webrtc_audio_device_test.h',
],
'dependencies': [
+ '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/libjingle/libjingle.gyp:libpeerconnection',
'../third_party/webrtc/modules/modules.gyp:audio_device',
'../third_party/webrtc/modules/modules.gyp:video_capture_module',
@@ -574,6 +575,7 @@
'renderer/media/webrtc_audio_device_unittest.cc',
],
'dependencies': [
+ '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/libjingle/libjingle.gyp:libpeerconnection',
'../third_party/webrtc/modules/modules.gyp:video_capture_module',
'../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',