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

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

Issue 1151683002: Roll WebRTC 9229:9238, Libjingle 9227:9240 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update libjingle.gyp Created 5 years, 7 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') | 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 'webrtc_p2p': "../webrtc/p2p", 14 'webrtc_p2p': "../webrtc/p2p",
15 'webrtc_xmpp': "../webrtc/libjingle/xmpp", 15 'webrtc_xmpp': "../webrtc/libjingle/xmpp",
16 }, 16 },
17 # Most of these settings have been split according to their scope into 17 # Most of these settings have been split according to their scope into
18 # :jingle_unexported_configs, :jingle_public_configs, 18 # :jingle_unexported_configs, :jingle_public_configs,
19 # :jingle_all_dependent_configs in the GN build. 19 # :jingle_all_dependent_configs in the GN build.
20 'target_defaults': { 20 'target_defaults': {
21 'defines': [ 21 'defines': [
22 'ENABLE_EXTERNAL_AUTH', 22 'ENABLE_EXTERNAL_AUTH',
23 'EXPAT_RELATIVE_PATH', 23 'EXPAT_RELATIVE_PATH',
24 'FEATURE_ENABLE_SSL', 24 'FEATURE_ENABLE_SSL',
25 'GTEST_RELATIVE_PATH', 25 'GTEST_RELATIVE_PATH',
26 'HAVE_SRTP', 26 'HAVE_SRTP',
27 'HAVE_WEBRTC_VIDEO', 27 'HAVE_WEBRTC_VIDEO',
28 'HAVE_WEBRTC_VOICE', 28 'HAVE_WEBRTC_VOICE',
29 'LIBPEERCONNECTION_LIB=1',
30 'LOGGING_INSIDE_WEBRTC', 29 'LOGGING_INSIDE_WEBRTC',
31 'NO_MAIN_THREAD_WRAPPING', 30 'NO_MAIN_THREAD_WRAPPING',
32 'NO_SOUND_SYSTEM', 31 'NO_SOUND_SYSTEM',
33 'SRTP_RELATIVE_PATH', 32 'SRTP_RELATIVE_PATH',
34 'USE_WEBRTC_DEV_BRANCH', 33 'USE_WEBRTC_DEV_BRANCH',
35 'WEBRTC_CHROMIUM_BUILD', 34 'WEBRTC_CHROMIUM_BUILD',
36 ], 35 ],
37 'configurations': { 36 'configurations': {
38 'Debug': { 37 'Debug': {
39 'defines': [ 38 'defines': [
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 'msvs_disabled_warnings': [ 4309, ], 317 'msvs_disabled_warnings': [ 4309, ],
319 }, # target peerconnection_server 318 }, # target peerconnection_server
320 ], 319 ],
321 'conditions': [ 320 'conditions': [
322 ['enable_webrtc==1', { 321 ['enable_webrtc==1', {
323 'targets': [ 322 'targets': [
324 { 323 {
325 # GN version: //third_party/libjingle:libjingle_webrtc_common 324 # GN version: //third_party/libjingle:libjingle_webrtc_common
326 'target_name': 'libjingle_webrtc_common', 325 'target_name': 'libjingle_webrtc_common',
327 'type': 'static_library', 326 'type': 'static_library',
328 'all_dependent_settings': {
329 'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
330 },
331 'sources': [ 327 'sources': [
332 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc', 328 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
333 '<(libjingle_source)/talk/app/webrtc/audiotrack.h', 329 '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
334 '<(libjingle_source)/talk/app/webrtc/audiotrackrenderer.cc', 330 '<(libjingle_source)/talk/app/webrtc/audiotrackrenderer.cc',
335 '<(libjingle_source)/talk/app/webrtc/audiotrackrenderer.h', 331 '<(libjingle_source)/talk/app/webrtc/audiotrackrenderer.h',
336 '<(libjingle_source)/talk/app/webrtc/datachannel.cc', 332 '<(libjingle_source)/talk/app/webrtc/datachannel.cc',
337 '<(libjingle_source)/talk/app/webrtc/datachannel.h', 333 '<(libjingle_source)/talk/app/webrtc/datachannel.h',
338 '<(libjingle_source)/talk/app/webrtc/dtlsidentityservice.cc', 334 '<(libjingle_source)/talk/app/webrtc/dtlsidentityservice.cc',
339 '<(libjingle_source)/talk/app/webrtc/dtlsidentityservice.h', 335 '<(libjingle_source)/talk/app/webrtc/dtlsidentityservice.h',
340 '<(libjingle_source)/talk/app/webrtc/dtlsidentitystore.cc', 336 '<(libjingle_source)/talk/app/webrtc/dtlsidentitystore.cc',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 'conditions': [ 574 'conditions': [
579 ['OS=="android"', { 575 ['OS=="android"', {
580 'standalone_static_library': 1, 576 'standalone_static_library': 1,
581 }], 577 }],
582 ], 578 ],
583 }, # target libpeerconnection 579 }, # target libpeerconnection
584 ], 580 ],
585 }], 581 }],
586 ], 582 ],
587 } 583 }
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