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

Side by Side 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, 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_unittests.isolate ('k') | third_party/libjingle/overrides/init_webrtc.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../../build/win_precompile.gypi', 7 '../../build/win_precompile.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'enabled_libjingle_device_manager%': 0, 10 'enabled_libjingle_device_manager%': 0,
11 'libjingle_additional_deps%': [], 11 'libjingle_additional_deps%': [],
12 'libjingle_peerconnection_additional_deps%': [], 12 'libjingle_peerconnection_additional_deps%': [],
13 'libjingle_source%': "source", 13 'libjingle_source%': "source",
14 'libpeer_target_type%': 'static_library', 14 'conditions': [
15 'libpeer_allocator_shim%': 0, 15 ['OS=="win" or OS=="mac" or OS=="linux"', {
16 'libpeer_target_type%': 'loadable_module',
17 }, {
18 'libpeer_target_type%': 'static_library',
19 }],
20 ],
16 }, 21 },
17 'target_defaults': { 22 'target_defaults': {
18 'defines': [ 23 'defines': [
19 'EXPAT_RELATIVE_PATH', 24 'EXPAT_RELATIVE_PATH',
20 'FEATURE_ENABLE_SSL', 25 'FEATURE_ENABLE_SSL',
21 'GTEST_RELATIVE_PATH', 26 'GTEST_RELATIVE_PATH',
22 'HAVE_SRTP', 27 'HAVE_SRTP',
23 'HAVE_WEBRTC_VIDEO', 28 'HAVE_WEBRTC_VIDEO',
24 'HAVE_WEBRTC_VOICE', 29 'HAVE_WEBRTC_VOICE',
25 'JSONCPP_RELATIVE_PATH', 30 'JSONCPP_RELATIVE_PATH',
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 '<(libjingle_source)/talk/session/media/ssrcmuxfilter.h', 758 '<(libjingle_source)/talk/session/media/ssrcmuxfilter.h',
754 '<(libjingle_source)/talk/session/media/typingmonitor.cc', 759 '<(libjingle_source)/talk/session/media/typingmonitor.cc',
755 '<(libjingle_source)/talk/session/media/typingmonitor.h', 760 '<(libjingle_source)/talk/session/media/typingmonitor.h',
756 '<(libjingle_source)/talk/session/media/voicechannel.h', 761 '<(libjingle_source)/talk/session/media/voicechannel.h',
757 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc', 762 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc',
758 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h', 763 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
759 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc', 764 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
760 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h', 765 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
761 ], 766 ],
762 'conditions': [ 767 'conditions': [
763 ['libpeer_allocator_shim==1 and ' 768 ['libpeer_target_type!="static_library" and OS!="mac"', {
764 'libpeer_target_type!="static_library" and OS!="mac"', {
765 'sources': [ 769 'sources': [
766 'overrides/allocator_shim/allocator_stub.cc', 770 'overrides/allocator_shim/allocator_stub.cc',
767 'overrides/allocator_shim/allocator_stub.h', 771 'overrides/allocator_shim/allocator_stub.h',
768 ], 772 ],
769 }], 773 }],
770 ['enabled_libjingle_device_manager==1', { 774 ['enabled_libjingle_device_manager==1', {
771 'sources!': [ 775 'sources!': [
772 '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc', 776 '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
773 '<(libjingle_source)/talk/media/devices/dummydevicemanager.h', 777 '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
774 ], 778 ],
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h', 863 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
860 ], 864 ],
861 'dependencies': [ 865 'dependencies': [
862 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 866 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
863 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_eng ine_core', 867 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_eng ine_core',
864 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core', 868 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core',
865 '<@(libjingle_peerconnection_additional_deps)', 869 '<@(libjingle_peerconnection_additional_deps)',
866 'libjingle_webrtc', 870 'libjingle_webrtc',
867 ], 871 ],
868 'conditions': [ 872 'conditions': [
869 ['libpeer_allocator_shim==1 and ' 873 ['libpeer_target_type!="static_library"', {
870 'libpeer_target_type!="static_library"', {
871 'sources': [ 874 'sources': [
872 'overrides/initialize_module.cc', 875 'overrides/initialize_module.cc',
873 ], 876 ],
874 'conditions': [ 877 'conditions': [
875 ['OS!="mac"', { 878 ['OS!="mac"', {
876 'sources': [ 879 'sources': [
877 'overrides/allocator_shim/allocator_proxy.cc', 880 'overrides/allocator_shim/allocator_proxy.cc',
878 ], 881 ],
879 }], 882 }],
880 ], 883 ],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 # in this directory and not lib.target as will otherwise be 915 # in this directory and not lib.target as will otherwise be
913 # the case with make builds. 916 # the case with make builds.
914 'product_dir': '<(PRODUCT_DIR)/lib', 917 'product_dir': '<(PRODUCT_DIR)/lib',
915 }], 918 }],
916 ], 919 ],
917 }, # target libpeerconnection 920 }, # target libpeerconnection
918 ], 921 ],
919 }], 922 }],
920 ], 923 ],
921 } 924 }
OLDNEW
« 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