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

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

Issue 8991010: This change updates the libjingle logging so that it writes to chromiums VLOG instead of its own ... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 8 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': {
7 'no_libjingle_logging%': 0,
8 },
9 'includes': [ 6 'includes': [
10 '../../build/win_precompile.gypi', 7 '../../build/win_precompile.gypi',
11 ], 8 ],
12 'target_defaults': { 9 'target_defaults': {
13 'defines': [ 10 'defines': [
14 'FEATURE_ENABLE_SSL', 11 'FEATURE_ENABLE_SSL',
15 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this? 12 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this?
16 '_USE_32BIT_TIME_T', 13 '_USE_32BIT_TIME_T',
17 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS', 14 'LOGGING_INSIDE_LIBJINGLE',
18 'EXPAT_RELATIVE_PATH', 15 'EXPAT_RELATIVE_PATH',
19 'JSONCPP_RELATIVE_PATH', 16 'JSONCPP_RELATIVE_PATH',
20 'WEBRTC_RELATIVE_PATH', 17 'WEBRTC_RELATIVE_PATH',
21 'HAVE_WEBRTC_VIDEO', 18 'HAVE_WEBRTC_VIDEO',
22 'HAVE_WEBRTC_VOICE', 19 'HAVE_WEBRTC_VOICE',
23 'NO_SOUND_SYSTEM', 20 'NO_SOUND_SYSTEM',
24 ], 21 ],
25 'configurations': { 22 'configurations': {
26 'Debug': { 23 'Debug': {
27 'defines': [ 24 'defines': [
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 ['os_posix == 1', { 84 ['os_posix == 1', {
88 'defines': [ 85 'defines': [
89 'POSIX', 86 'POSIX',
90 ], 87 ],
91 }], 88 }],
92 ['os_bsd==1', { 89 ['os_bsd==1', {
93 'defines': [ 90 'defines': [
94 'BSD', 91 'BSD',
95 ], 92 ],
96 }], 93 }],
97 ['no_libjingle_logging==1', {
98 'defines': [
99 'NO_LIBJINGLE_LOGGING',
100 ],
101 }],
102 ], 94 ],
103 }, 95 },
104 'all_dependent_settings': { 96 'all_dependent_settings': {
105 'configurations': { 97 'configurations': {
106 'Debug': { 98 'Debug': {
107 'defines': [ 99 'defines': [
108 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 100 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
109 # _DEBUG and remove this define. See above as well. 101 # _DEBUG and remove this define. See above as well.
110 '_DEBUG', 102 '_DEBUG',
111 ], 103 ],
(...skipping 29 matching lines...) Expand all
141 ], 133 ],
142 }, 134 },
143 'targets': [ 135 'targets': [
144 { 136 {
145 'target_name': 'libjingle', 137 'target_name': 'libjingle',
146 'type': 'static_library', 138 'type': 'static_library',
147 'sources': [ 139 'sources': [
148 'overrides/talk/base/basictypes.h', 140 'overrides/talk/base/basictypes.h',
149 'overrides/talk/base/constructormagic.h', 141 'overrides/talk/base/constructormagic.h',
150 142
151 # Need to override logging.h because we need 143 # Overrides logging.h/.cc because libjingle logging should be done to
152 # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work. 144 # the same place as the chromium logging.
153 # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to 145 'overrides/talk/base/logging.cc',
154 # libjingle and remove this override.
155 'overrides/talk/base/logging.h', 146 'overrides/talk/base/logging.h',
156 147
157 'overrides/talk/base/scoped_ptr.h', 148 'overrides/talk/base/scoped_ptr.h',
158 149
159 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', 150 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
160 'source/talk/base/asyncfile.cc', 151 'source/talk/base/asyncfile.cc',
161 'source/talk/base/asyncfile.h', 152 'source/talk/base/asyncfile.h',
162 'source/talk/base/asynchttprequest.cc', 153 'source/talk/base/asynchttprequest.cc',
163 'source/talk/base/asynchttprequest.h', 154 'source/talk/base/asynchttprequest.h',
164 'source/talk/base/asyncpacketsocket.h', 155 'source/talk/base/asyncpacketsocket.h',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 'source/talk/base/httpcommon-inl.h', 196 'source/talk/base/httpcommon-inl.h',
206 'source/talk/base/httpcommon.cc', 197 'source/talk/base/httpcommon.cc',
207 'source/talk/base/httpcommon.h', 198 'source/talk/base/httpcommon.h',
208 'source/talk/base/httprequest.cc', 199 'source/talk/base/httprequest.cc',
209 'source/talk/base/httprequest.h', 200 'source/talk/base/httprequest.h',
210 'source/talk/base/ipaddress.cc', 201 'source/talk/base/ipaddress.cc',
211 'source/talk/base/ipaddress.h', 202 'source/talk/base/ipaddress.h',
212 'source/talk/base/json.cc', 203 'source/talk/base/json.cc',
213 'source/talk/base/json.h', 204 'source/talk/base/json.h',
214 'source/talk/base/linked_ptr.h', 205 'source/talk/base/linked_ptr.h',
215 'source/talk/base/logging.cc',
216 'source/talk/base/md5.h', 206 'source/talk/base/md5.h',
217 'source/talk/base/md5c.c', 207 'source/talk/base/md5c.c',
218 'source/talk/base/messagehandler.cc', 208 'source/talk/base/messagehandler.cc',
219 'source/talk/base/messagehandler.h', 209 'source/talk/base/messagehandler.h',
220 'source/talk/base/messagequeue.cc', 210 'source/talk/base/messagequeue.cc',
221 'source/talk/base/messagequeue.h', 211 'source/talk/base/messagequeue.h',
222 'source/talk/base/nethelpers.cc', 212 'source/talk/base/nethelpers.cc',
223 'source/talk/base/nethelpers.h', 213 'source/talk/base/nethelpers.h',
224 'source/talk/base/network.cc', 214 'source/talk/base/network.cc',
225 'source/talk/base/network.h', 215 'source/talk/base/network.h',
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module', 516 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
527 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_ core', 517 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_ core',
528 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_ core', 518 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_ core',
529 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp: system_wrappers', 519 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp: system_wrappers',
530 'libjingle', 520 'libjingle',
531 'libjingle_p2p', 521 'libjingle_p2p',
532 ], 522 ],
533 }, # target libjingle_peerconnection 523 }, # target libjingle_peerconnection
534 ], 524 ],
535 } 525 }
OLDNEW
« no previous file with comments | « remoting/jingle_glue/xmpp_socket_adapter.cc ('k') | third_party/libjingle/overrides/talk/base/logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698