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

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

Issue 920043002: Remove references to 'libpeer_allocator_shim' gyp variable. This variable isn't used anymore. I'll… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« 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,
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 'libpeer_target_type%': 'static_library',
15 'libpeer_allocator_shim%': 0,
16 'webrtc_p2p': "../webrtc/p2p", 15 'webrtc_p2p': "../webrtc/p2p",
17 'webrtc_xmpp': "../webrtc/libjingle/xmpp", 16 'webrtc_xmpp': "../webrtc/libjingle/xmpp",
18 }, 17 },
19 # Most of these settings have been split according to their scope into 18 # Most of these settings have been split according to their scope into
20 # :jingle_unexported_configs, :jingle_direct_dependent_configs, 19 # :jingle_unexported_configs, :jingle_direct_dependent_configs,
21 # :jingle_all_dependent_configs in the GN build. 20 # :jingle_all_dependent_configs in the GN build.
22 'target_defaults': { 21 'target_defaults': {
23 'defines': [ 22 'defines': [
24 'EXPAT_RELATIVE_PATH', 23 'EXPAT_RELATIVE_PATH',
25 'FEATURE_ENABLE_SSL', 24 'FEATURE_ENABLE_SSL',
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 '<(libjingle_source)/talk/session/media/rtcpmuxfilter.h', 474 '<(libjingle_source)/talk/session/media/rtcpmuxfilter.h',
476 '<(libjingle_source)/talk/session/media/soundclip.cc', 475 '<(libjingle_source)/talk/session/media/soundclip.cc',
477 '<(libjingle_source)/talk/session/media/soundclip.h', 476 '<(libjingle_source)/talk/session/media/soundclip.h',
478 '<(libjingle_source)/talk/session/media/srtpfilter.cc', 477 '<(libjingle_source)/talk/session/media/srtpfilter.cc',
479 '<(libjingle_source)/talk/session/media/srtpfilter.h', 478 '<(libjingle_source)/talk/session/media/srtpfilter.h',
480 '<(libjingle_source)/talk/session/media/typingmonitor.cc', 479 '<(libjingle_source)/talk/session/media/typingmonitor.cc',
481 '<(libjingle_source)/talk/session/media/typingmonitor.h', 480 '<(libjingle_source)/talk/session/media/typingmonitor.h',
482 '<(libjingle_source)/talk/session/media/voicechannel.h', 481 '<(libjingle_source)/talk/session/media/voicechannel.h',
483 ], 482 ],
484 'conditions': [ 483 'conditions': [
485 ['libpeer_allocator_shim==1 and '
486 'libpeer_target_type!="static_library" and OS!="mac"', {
487 'sources': [
488 'overrides/allocator_shim/allocator_stub.cc',
489 'overrides/allocator_shim/allocator_stub.h',
490 ],
491 }],
492 # TODO(mallinath) - Enable SCTP for iOS. 484 # TODO(mallinath) - Enable SCTP for iOS.
493 ['OS!="ios"', { 485 ['OS!="ios"', {
494 'defines': [ 486 'defines': [
495 'HAVE_SCTP', 487 'HAVE_SCTP',
496 ], 488 ],
497 'sources': [ 489 'sources': [
498 '<(libjingle_source)/talk/media/sctp/sctpdataengine.cc', 490 '<(libjingle_source)/talk/media/sctp/sctpdataengine.cc',
499 '<(libjingle_source)/talk/media/sctp/sctpdataengine.h', 491 '<(libjingle_source)/talk/media/sctp/sctpdataengine.h',
500 ], 492 ],
501 'dependencies': [ 493 'dependencies': [
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 }, 665 },
674 'dependencies': [ 666 'dependencies': [
675 'libjingle_peerconnection_so', 667 'libjingle_peerconnection_so',
676 ], 668 ],
677 'includes': [ '../../build/java.gypi' ], 669 'includes': [ '../../build/java.gypi' ],
678 }, 670 },
679 ], 671 ],
680 }], 672 }],
681 ], 673 ],
682 } 674 }
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