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

Side by Side Diff: third_party/libjingle/libjingle.gyp

Issue 23766013: stopped disabling SCTP for windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: synced. Created 7 years, 3 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 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 'conditions': [ 776 'conditions': [
777 ['libpeer_allocator_shim==1 and ' 777 ['libpeer_allocator_shim==1 and '
778 'libpeer_target_type!="static_library" and OS!="mac"', { 778 'libpeer_target_type!="static_library" and OS!="mac"', {
779 'sources': [ 779 'sources': [
780 'overrides/allocator_shim/allocator_stub.cc', 780 'overrides/allocator_shim/allocator_stub.cc',
781 'overrides/allocator_shim/allocator_stub.h', 781 'overrides/allocator_shim/allocator_stub.h',
782 ], 782 ],
783 }], 783 }],
784 # TODO(mallinath) - Enable SCTP for Android and iOS platforms. 784 # TODO(mallinath) - Enable SCTP for Android and iOS platforms.
785 ['OS!="android" and OS!="ios"', { 785 ['OS!="android" and OS!="ios"', {
786 'conditions': [ 786 'defines': [
787 ['OS!="win"', { 787 'HAVE_SCTP',
788 'defines': [
789 'HAVE_SCTP',
790 ],
791 }],
792 ], 788 ],
793 'sources': [ 789 'sources': [
794 '<(libjingle_source)/talk/media/sctp/sctpdataengine.cc', 790 '<(libjingle_source)/talk/media/sctp/sctpdataengine.cc',
795 '<(libjingle_source)/talk/media/sctp/sctpdataengine.h', 791 '<(libjingle_source)/talk/media/sctp/sctpdataengine.h',
796 ], 792 ],
797 'dependencies': [ 793 'dependencies': [
798 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', 794 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
799 ], 795 ],
800 }], 796 }],
801 ['enabled_libjingle_device_manager==1', { 797 ['enabled_libjingle_device_manager==1', {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 # in this directory and not lib.target as will otherwise be 949 # in this directory and not lib.target as will otherwise be
954 # the case with make builds. 950 # the case with make builds.
955 'product_dir': '<(PRODUCT_DIR)/lib', 951 'product_dir': '<(PRODUCT_DIR)/lib',
956 }], 952 }],
957 ], 953 ],
958 }, # target libpeerconnection 954 }, # target libpeerconnection
959 ], 955 ],
960 }], 956 }],
961 ], 957 ],
962 } 958 }
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