Index: third_party/libjingle/libjingle.gyp |
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp |
index 19ed24a9c8062e29afff68e74431dcd941e1330f..420bbe4a72e937e98361b3c13892026010cb725c 100644 |
--- a/third_party/libjingle/libjingle.gyp |
+++ b/third_party/libjingle/libjingle.gyp |
@@ -13,6 +13,7 @@ |
'libjingle_source%': "source", |
'webrtc_p2p': "../webrtc/p2p", |
'webrtc_xmpp': "../webrtc/libjingle/xmpp", |
+ 'webrtc_system_wrappers': "../webrtc/system_wrappers", |
}, |
# Most of these settings have been split according to their scope into |
# :jingle_unexported_configs, :jingle_public_configs, |
@@ -273,8 +274,8 @@ |
['enable_webrtc==1', { |
'targets': [ |
{ |
- # GN version: //third_party/libjingle:libjingle_webrtc_common |
- 'target_name': 'libjingle_webrtc_common', |
+ # GN version: //third_party/libjingle:libjingle_webrtc_shared |
+ 'target_name': 'libjingle_webrtc_shared', |
'type': 'static_library', |
'sources': [ |
'<(libjingle_source)/talk/app/webrtc/audiotrack.cc', |
@@ -479,7 +480,20 @@ |
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render', |
'libjingle', |
], |
- }, # target libjingle_webrtc_common |
+ }, # target libjingle_webrtc_shared |
+ { |
+ # GN version: //third_party/libjingle:libjingle_webrtc_common |
Sergey Ulanov
2015/10/23 20:42:27
What is this target going to be used for?
Please a
|
+ 'target_name': 'libjingle_webrtc_common', |
tommi (sloooow) - chröme
2015/10/23 20:46:31
There's no target in this gyp file that depends on
|
+ 'type': 'static_library', |
+ 'sources': [ |
+ '<(webrtc_system_wrappers)/interface/field_trial_default.h', |
+ '<(webrtc_system_wrappers)/interface/field_trial.h', |
+ '<(webrtc_system_wrappers)/source/field_trial_default.cc', |
+ ], |
+ 'dependencies': [ |
+ 'libjingle_webrtc_shared', |
+ ], |
+ }, |
Sergey Ulanov
2015/10/23 20:42:27
# target libjingle_webrtc_common
|
{ |
# GN version: //third_party/libjingle:libjingle_webrtc |
'target_name': 'libjingle_webrtc', |
@@ -490,7 +504,7 @@ |
], |
'dependencies': [ |
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing', |
- 'libjingle_webrtc_common', |
+ 'libjingle_webrtc_shared', |
], |
}, |
{ |
@@ -512,7 +526,7 @@ |
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine', |
'<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc', |
'<@(libjingle_peerconnection_additional_deps)', |
- 'libjingle_webrtc_common', |
+ 'libjingle_webrtc_shared', |
], |
'conditions': [ |
['OS=="android"', { |