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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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,
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 'libjingle', 615 'libjingle',
616 ], 616 ],
617 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 617 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
618 'msvs_disabled_warnings': [ 4309, ], 618 'msvs_disabled_warnings': [ 4309, ],
619 }, # target peerconnection_server 619 }, # target peerconnection_server
620 ], 620 ],
621 'conditions': [ 621 'conditions': [
622 ['enable_webrtc==1', { 622 ['enable_webrtc==1', {
623 'targets': [ 623 'targets': [
624 { 624 {
625 'target_name': 'libjingle_webrtc', 625 'target_name': 'libjingle_webrtc_common',
626 'type': 'static_library', 626 'type': 'static_library',
627 'all_dependent_settings': { 627 'all_dependent_settings': {
628 'conditions': [ 628 'conditions': [
629 ['"<(libpeer_target_type)"=="static_library"', { 629 ['"<(libpeer_target_type)"=="static_library"', {
630 'defines': [ 'LIBPEERCONNECTION_LIB=1' ], 630 'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
631 }], 631 }],
632 ], 632 ],
633 }, 633 },
634 'sources': [ 634 'sources': [
635 'overrides/init_webrtc.cc',
636 'overrides/init_webrtc.h',
637 'overrides/talk/media/webrtc/webrtcexport.h', 635 'overrides/talk/media/webrtc/webrtcexport.h',
638 636
639 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc', 637 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
640 '<(libjingle_source)/talk/app/webrtc/audiotrack.h', 638 '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
641 '<(libjingle_source)/talk/app/webrtc/datachannel.cc', 639 '<(libjingle_source)/talk/app/webrtc/datachannel.cc',
642 '<(libjingle_source)/talk/app/webrtc/datachannel.h', 640 '<(libjingle_source)/talk/app/webrtc/datachannel.h',
643 '<(libjingle_source)/talk/app/webrtc/dtmfsender.cc', 641 '<(libjingle_source)/talk/app/webrtc/dtmfsender.cc',
644 '<(libjingle_source)/talk/app/webrtc/dtmfsender.h', 642 '<(libjingle_source)/talk/app/webrtc/dtmfsender.h',
645 '<(libjingle_source)/talk/app/webrtc/jsep.h', 643 '<(libjingle_source)/talk/app/webrtc/jsep.h',
646 '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.cc', 644 '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.cc',
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 ], 844 ],
847 }], 845 }],
848 ], 846 ],
849 'dependencies': [ 847 'dependencies': [
850 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', 848 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
851 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file', 849 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
852 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_modul e', 850 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_modul e',
853 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module ', 851 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module ',
854 'libjingle', 852 'libjingle',
855 ], 853 ],
856 }, # target libjingle_webrtc 854 }, # target libjingle_webrtc_common
855 {
856 'target_name': 'libjingle_webrtc',
857 'type': 'static_library',
858 'sources': [
859 'overrides/init_webrtc.cc',
860 'overrides/init_webrtc.h',
861 ],
862 'dependencies': [
863 'libjingle_webrtc_common',
864 ],
865 },
857 { 866 {
858 'target_name': 'libpeerconnection', 867 'target_name': 'libpeerconnection',
859 'type': '<(libpeer_target_type)', 868 'type': '<(libpeer_target_type)',
860 'sources': [ 869 'sources': [
861 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc', 870 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
862 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h', 871 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
863 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc', 872 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
864 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h', 873 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
865 ], 874 ],
866 'dependencies': [ 875 'dependencies': [
867 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 876 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
868 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_eng ine_core', 877 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_eng ine_core',
869 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core', 878 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core',
870 '<@(libjingle_peerconnection_additional_deps)', 879 '<@(libjingle_peerconnection_additional_deps)',
871 'libjingle_webrtc', 880 'libjingle_webrtc_common',
872 ], 881 ],
873 'conditions': [ 882 'conditions': [
874 ['libpeer_allocator_shim==1 and ' 883 ['libpeer_allocator_shim==1 and '
875 'libpeer_target_type!="static_library"', { 884 'libpeer_target_type!="static_library"', {
876 'sources': [ 885 'sources': [
877 'overrides/initialize_module.cc', 886 'overrides/initialize_module.cc',
878 ], 887 ],
879 'conditions': [ 888 'conditions': [
880 ['OS!="mac"', { 889 ['OS!="mac"', {
881 'sources': [ 890 'sources': [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 # in this directory and not lib.target as will otherwise be 926 # in this directory and not lib.target as will otherwise be
918 # the case with make builds. 927 # the case with make builds.
919 'product_dir': '<(PRODUCT_DIR)/lib', 928 'product_dir': '<(PRODUCT_DIR)/lib',
920 }], 929 }],
921 ], 930 ],
922 }, # target libpeerconnection 931 }, # target libpeerconnection
923 ], 932 ],
924 }], 933 }],
925 ], 934 ],
926 } 935 }
OLDNEW
« 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