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

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

Issue 11066063: Update webrtc to 2881 and libjingle to 202. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « 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,
11 }, 11 },
12 'target_defaults': { 12 'target_defaults': {
13 'defines': [ 13 'defines': [
14 'EXPAT_RELATIVE_PATH', 14 'EXPAT_RELATIVE_PATH',
15 'FEATURE_ENABLE_SSL', 15 'FEATURE_ENABLE_SSL',
16 'GTEST_RELATIVE_PATH', 16 'GTEST_RELATIVE_PATH',
17 'HAVE_SRTP', 17 'HAVE_SRTP',
18 'HAVE_WEBRTC_VIDEO', 18 'HAVE_WEBRTC_VIDEO',
19 'HAVE_WEBRTC_VOICE', 19 'HAVE_WEBRTC_VOICE',
20 'JSONCPP_RELATIVE_PATH', 20 'JSONCPP_RELATIVE_PATH',
21 'LOGGING_INSIDE_LIBJINGLE', 21 'LOGGING_INSIDE_LIBJINGLE',
22 'NO_MAIN_THREAD_WRAPPING', 22 'NO_MAIN_THREAD_WRAPPING',
23 'NO_SOUND_SYSTEM', 23 'NO_SOUND_SYSTEM',
24 'SRTP_RELATIVE_PATH', 24 'SRTP_RELATIVE_PATH',
25 '_USE_32BIT_TIME_T', 25 '_USE_32BIT_TIME_T',
26 # TODO(ronghuawu): Remove this once libjingle is updated to use the new
27 # webrtc.
28 'USE_WEBRTC_DEV_BRANCH',
26 ], 29 ],
27 'configurations': { 30 'configurations': {
28 'Debug': { 31 'Debug': {
29 'defines': [ 32 'defines': [
30 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 33 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
31 # _DEBUG and remove this define. See below as well. 34 # _DEBUG and remove this define. See below as well.
32 '_DEBUG', 35 '_DEBUG',
33 ], 36 ],
34 } 37 }
35 }, 38 },
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 ], 709 ],
707 'include_dirs': [ 710 'include_dirs': [
708 'source', 711 'source',
709 ], 712 ],
710 'dependencies': [ 713 'dependencies': [
711 'libjingle', 714 'libjingle',
712 ], 715 ],
713 }, # target peerconnection_server 716 }, # target peerconnection_server
714 ], 717 ],
715 } 718 }
OLDNEW
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698