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

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

Issue 545003004: Roll WebRTC 7011:7046 libjingle: 7007:7045 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | third_party/libjingle/libjingle_common.gypi » ('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,
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 'target_name': 'libjingle', 270 'target_name': 'libjingle',
271 'type': 'static_library', 271 'type': 'static_library',
272 'includes': [ 'libjingle_common.gypi' ], 272 'includes': [ 'libjingle_common.gypi' ],
273 'sources!' : [ 273 'sources!' : [
274 # Compiled as part of libjingle_p2p_constants. 274 # Compiled as part of libjingle_p2p_constants.
275 '<(libjingle_source)/talk/p2p/base/constants.cc', 275 '<(libjingle_source)/talk/p2p/base/constants.cc',
276 '<(libjingle_source)/talk/p2p/base/constants.h', 276 '<(libjingle_source)/talk/p2p/base/constants.h',
277 ], 277 ],
278 'dependencies': [ 278 'dependencies': [
279 '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base', 279 '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base',
280 '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
280 'libjingle_p2p_constants', 281 'libjingle_p2p_constants',
281 '<@(libjingle_additional_deps)', 282 '<@(libjingle_additional_deps)',
282 ], 283 ],
283 }, # target libjingle 284 }, # target libjingle
284 # This has to be is a separate project due to a bug in MSVS 2008 and the 285 # This has to be is a separate project due to a bug in MSVS 2008 and the
285 # current toolset on android. The problem is that we have two files named 286 # current toolset on android. The problem is that we have two files named
286 # "constants.cc" and MSVS/android doesn't handle this properly. 287 # "constants.cc" and MSVS/android doesn't handle this properly.
287 # GYP currently has guards to catch this, so if you want to remove it, 288 # GYP currently has guards to catch this, so if you want to remove it,
288 # run GYP and if GYP has removed the validation check, then we can assume 289 # run GYP and if GYP has removed the validation check, then we can assume
289 # that the toolchains have been fixed (we currently use VS2010 and later, 290 # that the toolchains have been fixed (we currently use VS2010 and later,
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 # in this directory and not lib.target as will otherwise be 663 # in this directory and not lib.target as will otherwise be
663 # the case with make builds. 664 # the case with make builds.
664 'product_dir': '<(PRODUCT_DIR)/lib', 665 'product_dir': '<(PRODUCT_DIR)/lib',
665 }], 666 }],
666 ], 667 ],
667 }, # target libpeerconnection 668 }, # target libpeerconnection
668 ], 669 ],
669 }], 670 }],
670 ], 671 ],
671 } 672 }
OLDNEW
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | third_party/libjingle/libjingle_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698