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

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

Issue 166753002: Roll WebRTC 5523:5548. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed webrtc:: from StatsOutputLevel Created 6 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
« DEPS ('K') | « third_party/libjingle/README.chromium ('k') | 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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 # don't actually need this code at all. 575 # don't actually need this code at all.
576 '<(libjingle_source)/talk/base/json.cc', 576 '<(libjingle_source)/talk/base/json.cc',
577 '<(libjingle_source)/talk/base/json.h', 577 '<(libjingle_source)/talk/base/json.h',
578 ], 578 ],
579 'dependencies!': [ 579 'dependencies!': [
580 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', 580 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
581 ], 581 ],
582 }], 582 }],
583 ['use_openssl==1', { 583 ['use_openssl==1', {
584 'sources': [ 584 'sources': [
585 '<(libjingle_source)/talk/base/openssl.h',
585 '<(libjingle_source)/talk/base/openssladapter.cc', 586 '<(libjingle_source)/talk/base/openssladapter.cc',
586 '<(libjingle_source)/talk/base/openssldigest.cc', 587 '<(libjingle_source)/talk/base/openssldigest.cc',
587 '<(libjingle_source)/talk/base/opensslidentity.cc', 588 '<(libjingle_source)/talk/base/opensslidentity.cc',
588 '<(libjingle_source)/talk/base/opensslstreamadapter.cc', 589 '<(libjingle_source)/talk/base/opensslstreamadapter.cc',
589 ], 590 ],
590 }], 591 }],
591 ], 592 ],
592 }, # target libjingle 593 }, # target libjingle
593 # This has to be is a separate project due to a bug in MSVS 2008 and the 594 # This has to be is a separate project due to a bug in MSVS 2008 and the
594 # current toolset on android. The problem is that we have two files named 595 # current toolset on android. The problem is that we have two files named
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 '<(libjingle_source)/talk/app/webrtc/mediastreamtrack.h', 673 '<(libjingle_source)/talk/app/webrtc/mediastreamtrack.h',
673 '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.h', 674 '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.h',
674 '<(libjingle_source)/talk/app/webrtc/notifier.h', 675 '<(libjingle_source)/talk/app/webrtc/notifier.h',
675 '<(libjingle_source)/talk/app/webrtc/peerconnection.cc', 676 '<(libjingle_source)/talk/app/webrtc/peerconnection.cc',
676 '<(libjingle_source)/talk/app/webrtc/peerconnection.h', 677 '<(libjingle_source)/talk/app/webrtc/peerconnection.h',
677 '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc', 678 '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc',
678 '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.h', 679 '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.h',
679 '<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h', 680 '<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h',
680 '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc', 681 '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc',
681 '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h', 682 '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h',
683 '<(libjingle_source)/talk/app/webrtc/remoteaudiosource.cc',
684 '<(libjingle_source)/talk/app/webrtc/remoteaudiosource.h',
682 '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.cc', 685 '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.cc',
683 '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.h', 686 '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.h',
684 '<(libjingle_source)/talk/app/webrtc/sctputils.cc', 687 '<(libjingle_source)/talk/app/webrtc/sctputils.cc',
685 '<(libjingle_source)/talk/app/webrtc/sctputils.h', 688 '<(libjingle_source)/talk/app/webrtc/sctputils.h',
686 '<(libjingle_source)/talk/app/webrtc/statscollector.cc', 689 '<(libjingle_source)/talk/app/webrtc/statscollector.cc',
687 '<(libjingle_source)/talk/app/webrtc/statscollector.h', 690 '<(libjingle_source)/talk/app/webrtc/statscollector.h',
688 '<(libjingle_source)/talk/app/webrtc/statstypes.h', 691 '<(libjingle_source)/talk/app/webrtc/statstypes.h',
689 '<(libjingle_source)/talk/app/webrtc/streamcollection.h', 692 '<(libjingle_source)/talk/app/webrtc/streamcollection.h',
690 '<(libjingle_source)/talk/app/webrtc/videosource.cc', 693 '<(libjingle_source)/talk/app/webrtc/videosource.cc',
691 '<(libjingle_source)/talk/app/webrtc/videosource.h', 694 '<(libjingle_source)/talk/app/webrtc/videosource.h',
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 # in this directory and not lib.target as will otherwise be 962 # in this directory and not lib.target as will otherwise be
960 # the case with make builds. 963 # the case with make builds.
961 'product_dir': '<(PRODUCT_DIR)/lib', 964 'product_dir': '<(PRODUCT_DIR)/lib',
962 }], 965 }],
963 ], 966 ],
964 }, # target libpeerconnection 967 }, # target libpeerconnection
965 ], 968 ],
966 }], 969 }],
967 ], 970 ],
968 } 971 }
OLDNEW
« DEPS ('K') | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698