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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp (revision 113136)
+++ third_party/libjingle/libjingle.gyp (working copy)
@@ -3,9 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'no_libjingle_logging%': 0,
- },
'includes': [
'../../build/win_precompile.gypi',
],
@@ -14,7 +11,7 @@
'FEATURE_ENABLE_SSL',
'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this?
'_USE_32BIT_TIME_T',
- 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS',
+ 'LOGGING_INSIDE_LIBJINGLE',
'EXPAT_RELATIVE_PATH',
'JSONCPP_RELATIVE_PATH',
'WEBRTC_RELATIVE_PATH',
@@ -94,11 +91,6 @@
'BSD',
],
}],
- ['no_libjingle_logging==1', {
- 'defines': [
- 'NO_LIBJINGLE_LOGGING',
- ],
- }],
],
},
'all_dependent_settings': {
@@ -148,10 +140,9 @@
'overrides/talk/base/basictypes.h',
'overrides/talk/base/constructormagic.h',
- # Need to override logging.h because we need
- # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work.
- # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to
- # libjingle and remove this override.
+ # Overrides logging.h/.cc because libjingle logging should be done to
+ # the same place as the chromium logging.
+ 'overrides/talk/base/logging.cc',
'overrides/talk/base/logging.h',
'overrides/talk/base/scoped_ptr.h',
@@ -212,7 +203,6 @@
'source/talk/base/json.cc',
'source/talk/base/json.h',
'source/talk/base/linked_ptr.h',
- 'source/talk/base/logging.cc',
'source/talk/base/md5.h',
'source/talk/base/md5c.c',
'source/talk/base/messagehandler.cc',
« 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