| Index: third_party/libjingle/libjingle.gyp
|
| diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
|
| index aa39c5a52a24ff9a47f5761708da962ba1494f61..61b2c588e72cd638176680388fcc1e9fa074087b 100644
|
| --- a/third_party/libjingle/libjingle.gyp
|
| +++ b/third_party/libjingle/libjingle.gyp
|
| @@ -11,8 +11,13 @@
|
| 'libjingle_additional_deps%': [],
|
| 'libjingle_peerconnection_additional_deps%': [],
|
| 'libjingle_source%': "source",
|
| - 'libpeer_target_type%': 'static_library',
|
| - 'libpeer_allocator_shim%': 0,
|
| + 'conditions': [
|
| + ['OS=="win" or OS=="mac" or OS=="linux"', {
|
| + 'libpeer_target_type%': 'loadable_module',
|
| + }, {
|
| + 'libpeer_target_type%': 'static_library',
|
| + }],
|
| + ],
|
| },
|
| 'target_defaults': {
|
| 'defines': [
|
| @@ -760,8 +765,7 @@
|
| '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
|
| ],
|
| 'conditions': [
|
| - ['libpeer_allocator_shim==1 and '
|
| - 'libpeer_target_type!="static_library" and OS!="mac"', {
|
| + ['libpeer_target_type!="static_library" and OS!="mac"', {
|
| 'sources': [
|
| 'overrides/allocator_shim/allocator_stub.cc',
|
| 'overrides/allocator_shim/allocator_stub.h',
|
| @@ -866,8 +870,7 @@
|
| 'libjingle_webrtc',
|
| ],
|
| 'conditions': [
|
| - ['libpeer_allocator_shim==1 and '
|
| - 'libpeer_target_type!="static_library"', {
|
| + ['libpeer_target_type!="static_library"', {
|
| 'sources': [
|
| 'overrides/initialize_module.cc',
|
| ],
|
|
|