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

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

Issue 11946026: Partially merge r177090 for crbug.com/169131. (Closed) Base URL: svn://chrome-svn/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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
« DEPS ('K') | « DEPS ('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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 ['use_openssl==1', { 141 ['use_openssl==1', {
142 'defines': [ 142 'defines': [
143 'SSL_USE_OPENSSL', 143 'SSL_USE_OPENSSL',
144 'HAVE_OPENSSL_SSL_H', 144 'HAVE_OPENSSL_SSL_H',
145 ], 145 ],
146 'dependencies': [ 146 'dependencies': [
147 '../../third_party/openssl/openssl.gyp:openssl', 147 '../../third_party/openssl/openssl.gyp:openssl',
148 ], 148 ],
149 }, { 149 }, {
150 'defines': [ 150 'defines': [
151 'SSL_USE_NSS',
152 'HAVE_NSS_SSL_H',
151 'SSL_USE_NSS_RNG', 153 'SSL_USE_NSS_RNG',
152 ], 154 ],
153 'conditions': [ 155 'conditions': [
154 ['os_posix == 1 and OS != "mac" and OS != "ios" and ' 156 ['os_posix == 1 and OS != "mac" and OS != "ios" and '
155 'OS != "android"', { 157 'OS != "android"', {
Ryan Sleevi 2013/01/16 23:04:09 FWIW, this is not officially supported GYP syntax,
Ronghua Wu (Left Chromium) 2013/01/17 00:36:48 Done. Will make the same change in trunk.
156 'dependencies': [ 158 'dependencies': [
157 '<(DEPTH)/build/linux/system.gyp:ssl', 159 '<(DEPTH)/build/linux/system.gyp:ssl',
158 ], 160 ],
159 }], 161 }],
160 ['OS == "mac" or OS == "ios" or OS == "win"', { 162 ['OS == "mac" or OS == "ios" or OS == "win"', {
161 'dependencies': [ 163 'dependencies': [
164 '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
162 '<(DEPTH)/third_party/nss/nss.gyp:nspr', 165 '<(DEPTH)/third_party/nss/nss.gyp:nspr',
163 '<(DEPTH)/third_party/nss/nss.gyp:nss', 166 '<(DEPTH)/third_party/nss/nss.gyp:nss',
164 ], 167 ],
165 }], 168 }],
166 ], 169 ],
167 }], 170 }],
168 ['OS=="win"', { 171 ['OS=="win"', {
169 'include_dirs': [ 172 'include_dirs': [
170 '../third_party/platformsdk_win7/files/Include', 173 '../third_party/platformsdk_win7/files/Include',
171 ], 174 ],
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 '<(libjingle_source)/talk/base/socketaddresspair.cc', 322 '<(libjingle_source)/talk/base/socketaddresspair.cc',
320 '<(libjingle_source)/talk/base/socketaddresspair.h', 323 '<(libjingle_source)/talk/base/socketaddresspair.h',
321 '<(libjingle_source)/talk/base/socketfactory.h', 324 '<(libjingle_source)/talk/base/socketfactory.h',
322 '<(libjingle_source)/talk/base/socketpool.cc', 325 '<(libjingle_source)/talk/base/socketpool.cc',
323 '<(libjingle_source)/talk/base/socketpool.h', 326 '<(libjingle_source)/talk/base/socketpool.h',
324 '<(libjingle_source)/talk/base/socketserver.h', 327 '<(libjingle_source)/talk/base/socketserver.h',
325 '<(libjingle_source)/talk/base/socketstream.cc', 328 '<(libjingle_source)/talk/base/socketstream.cc',
326 '<(libjingle_source)/talk/base/socketstream.h', 329 '<(libjingle_source)/talk/base/socketstream.h',
327 '<(libjingle_source)/talk/base/ssladapter.cc', 330 '<(libjingle_source)/talk/base/ssladapter.cc',
328 '<(libjingle_source)/talk/base/ssladapter.h', 331 '<(libjingle_source)/talk/base/ssladapter.h',
332 '<(libjingle_source)/talk/base/sslidentity.cc',
333 '<(libjingle_source)/talk/base/sslidentity.h',
329 '<(libjingle_source)/talk/base/sslsocketfactory.cc', 334 '<(libjingle_source)/talk/base/sslsocketfactory.cc',
330 '<(libjingle_source)/talk/base/sslsocketfactory.h', 335 '<(libjingle_source)/talk/base/sslsocketfactory.h',
331 '<(libjingle_source)/talk/base/sslstreamadapter.cc', 336 '<(libjingle_source)/talk/base/sslstreamadapter.cc',
332 '<(libjingle_source)/talk/base/sslstreamadapter.h', 337 '<(libjingle_source)/talk/base/sslstreamadapter.h',
333 '<(libjingle_source)/talk/base/sslstreamadapterhelper.cc', 338 '<(libjingle_source)/talk/base/sslstreamadapterhelper.cc',
334 '<(libjingle_source)/talk/base/sslstreamadapterhelper.h', 339 '<(libjingle_source)/talk/base/sslstreamadapterhelper.h',
335 '<(libjingle_source)/talk/base/stream.cc', 340 '<(libjingle_source)/talk/base/stream.cc',
336 '<(libjingle_source)/talk/base/stream.h', 341 '<(libjingle_source)/talk/base/stream.h',
337 '<(libjingle_source)/talk/base/stringencode.cc', 342 '<(libjingle_source)/talk/base/stringencode.cc',
338 '<(libjingle_source)/talk/base/stringencode.h', 343 '<(libjingle_source)/talk/base/stringencode.h',
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 789 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
785 '<@(libjingle_peerconnection_additional_deps)', 790 '<@(libjingle_peerconnection_additional_deps)',
786 'libjingle', 791 'libjingle',
787 'libjingle_p2p', 792 'libjingle_p2p',
788 ], 793 ],
789 }, # target libjingle_peerconnection 794 }, # target libjingle_peerconnection
790 ], 795 ],
791 }], 796 }],
792 ], 797 ],
793 } 798 }
OLDNEW
« DEPS ('K') | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698