Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1026)

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 14617018: Split the init_webrtc sources into a separate target. We need to do this to avoid potential linker … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 535535b051d3b0a150e2d37ba1a6d165ee15885b..e34190e69f8dfee8c41fa743f955ba02b07481d3 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -622,7 +622,7 @@
['enable_webrtc==1', {
'targets': [
{
- 'target_name': 'libjingle_webrtc',
+ 'target_name': 'libjingle_webrtc_common',
'type': 'static_library',
'all_dependent_settings': {
'conditions': [
@@ -632,8 +632,6 @@
],
},
'sources': [
- 'overrides/init_webrtc.cc',
- 'overrides/init_webrtc.h',
'overrides/talk/media/webrtc/webrtcexport.h',
'<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
@@ -853,7 +851,18 @@
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
'libjingle',
],
- }, # target libjingle_webrtc
+ }, # target libjingle_webrtc_common
+ {
+ 'target_name': 'libjingle_webrtc',
+ 'type': 'static_library',
+ 'sources': [
+ 'overrides/init_webrtc.cc',
+ 'overrides/init_webrtc.h',
+ ],
+ 'dependencies': [
+ 'libjingle_webrtc_common',
+ ],
+ },
{
'target_name': 'libpeerconnection',
'type': '<(libpeer_target_type)',
@@ -868,7 +877,7 @@
'<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
'<@(libjingle_peerconnection_additional_deps)',
- 'libjingle_webrtc',
+ 'libjingle_webrtc_common',
],
'conditions': [
['libpeer_allocator_shim==1 and '
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698