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

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': { 6 'variables': {
7 'no_libjingle_logging%': 0, 7 'no_libjingle_logging%': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../../build/win_precompile.gypi', 10 '../../build/win_precompile.gypi',
11 ], 11 ],
12 'target_defaults': { 12 'target_defaults': {
13 'defines': [ 13 'defines': [
14 'FEATURE_ENABLE_SSL', 14 'FEATURE_ENABLE_SSL',
15 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this? 15 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this?
16 '_USE_32BIT_TIME_T', 16 '_USE_32BIT_TIME_T',
17 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS', 17 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS',
Sergey Ulanov 2011/12/28 02:38:15 Remove this?
hellner 2012/01/10 23:31:28 I looked through the chromium code and there doesn
18 'EXPAT_RELATIVE_PATH', 18 'EXPAT_RELATIVE_PATH',
19 'JSONCPP_RELATIVE_PATH', 19 'JSONCPP_RELATIVE_PATH',
20 'WEBRTC_RELATIVE_PATH', 20 'WEBRTC_RELATIVE_PATH',
21 'HAVE_WEBRTC_VIDEO', 21 'HAVE_WEBRTC_VIDEO',
22 'HAVE_WEBRTC_VOICE', 22 'HAVE_WEBRTC_VOICE',
23 'NO_SOUND_SYSTEM', 23 'NO_SOUND_SYSTEM',
24 ], 24 ],
25 'configurations': { 25 'configurations': {
26 'Debug': { 26 'Debug': {
27 'defines': [ 27 'defines': [
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 }, 142 },
143 'targets': [ 143 'targets': [
144 { 144 {
145 'target_name': 'libjingle', 145 'target_name': 'libjingle',
146 'type': 'static_library', 146 'type': 'static_library',
147 'sources': [ 147 'sources': [
148 'overrides/talk/base/basictypes.h', 148 'overrides/talk/base/basictypes.h',
149 'overrides/talk/base/constructormagic.h', 149 'overrides/talk/base/constructormagic.h',
150 150
151 # Need to override logging.h because we need 151 # Need to override logging.h because we need
152 # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work. 152 # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work.
Sergey Ulanov 2011/12/28 02:38:15 Update this comment.
hellner 2012/01/10 23:31:28 Done.
153 # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to 153 # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to
Sergey Ulanov 2011/12/28 02:38:15 this TODO is no longer relevant. Remove it?
hellner 2012/01/10 23:31:28 Done.
154 # libjingle and remove this override. 154 # libjingle and remove this override.
155 'overrides/talk/base/logging.cc',
155 'overrides/talk/base/logging.h', 156 'overrides/talk/base/logging.h',
156 157
157 'overrides/talk/base/scoped_ptr.h', 158 'overrides/talk/base/scoped_ptr.h',
158 159
159 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', 160 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
160 'source/talk/base/asyncfile.cc', 161 'source/talk/base/asyncfile.cc',
161 'source/talk/base/asyncfile.h', 162 'source/talk/base/asyncfile.h',
162 'source/talk/base/asynchttprequest.cc', 163 'source/talk/base/asynchttprequest.cc',
163 'source/talk/base/asynchttprequest.h', 164 'source/talk/base/asynchttprequest.h',
164 'source/talk/base/asyncpacketsocket.h', 165 'source/talk/base/asyncpacketsocket.h',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 'source/talk/base/httpcommon-inl.h', 206 'source/talk/base/httpcommon-inl.h',
206 'source/talk/base/httpcommon.cc', 207 'source/talk/base/httpcommon.cc',
207 'source/talk/base/httpcommon.h', 208 'source/talk/base/httpcommon.h',
208 'source/talk/base/httprequest.cc', 209 'source/talk/base/httprequest.cc',
209 'source/talk/base/httprequest.h', 210 'source/talk/base/httprequest.h',
210 'source/talk/base/ipaddress.cc', 211 'source/talk/base/ipaddress.cc',
211 'source/talk/base/ipaddress.h', 212 'source/talk/base/ipaddress.h',
212 'source/talk/base/json.cc', 213 'source/talk/base/json.cc',
213 'source/talk/base/json.h', 214 'source/talk/base/json.h',
214 'source/talk/base/linked_ptr.h', 215 'source/talk/base/linked_ptr.h',
215 'source/talk/base/logging.cc',
216 'source/talk/base/md5.h', 216 'source/talk/base/md5.h',
217 'source/talk/base/md5c.c', 217 'source/talk/base/md5c.c',
218 'source/talk/base/messagehandler.cc', 218 'source/talk/base/messagehandler.cc',
219 'source/talk/base/messagehandler.h', 219 'source/talk/base/messagehandler.h',
220 'source/talk/base/messagequeue.cc', 220 'source/talk/base/messagequeue.cc',
221 'source/talk/base/messagequeue.h', 221 'source/talk/base/messagequeue.h',
222 'source/talk/base/nethelpers.cc', 222 'source/talk/base/nethelpers.cc',
223 'source/talk/base/nethelpers.h', 223 'source/talk/base/nethelpers.h',
224 'source/talk/base/network.cc', 224 'source/talk/base/network.cc',
225 'source/talk/base/network.h', 225 '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', 526 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
527 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_ core', 527 '<(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', 528 '<(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', 529 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp: system_wrappers',
530 'libjingle', 530 'libjingle',
531 'libjingle_p2p', 531 'libjingle_p2p',
532 ], 532 ],
533 }, # target libjingle_peerconnection 533 }, # target libjingle_peerconnection
534 ], 534 ],
535 } 535 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698