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

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 14907003: Build libpeerconnection as a loadable module for win, mac and linux by default. Also remove the all… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add support for loading the .so from the build layout. Created 7 years, 8 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 | « content/content_unittests.isolate ('k') | third_party/libjingle/overrides/init_webrtc.cc » ('j') | 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 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',
],
« no previous file with comments | « content/content_unittests.isolate ('k') | third_party/libjingle/overrides/init_webrtc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698