diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 22:09:21 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 22:09:21 +0000 |
| commit | 10fc3db93f082025c005f097ea45c381bdfb3cd0 (patch) | |
| tree | c76fb4c604622c2a90b0a423bfbac3363dc3d53d /third_party/libjingle | |
| parent | bd026803b2a3db66f2003f83c4b7e627c71828a2 (diff) | |
| download | chromium_src-10fc3db93f082025c005f097ea45c381bdfb3cd0.zip chromium_src-10fc3db93f082025c005f097ea45c381bdfb3cd0.tar.gz chromium_src-10fc3db93f082025c005f097ea45c381bdfb3cd0.tar.bz2 | |
Added option to disable logging in libjingle
TEST=compile libjingle with and without no_libjingle_loggin=1
BUG=None
Review URL: http://codereview.chromium.org/2852031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 8 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/logging.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 239a55b..3eb5428 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'variables': { + 'no_libjingle_logging%': 0, + }, 'target_defaults': { 'defines': [ 'FEATURE_ENABLE_SSL', @@ -79,6 +82,11 @@ 'BSD', ], }], + ['no_libjingle_logging==1', { + 'defines': [ + 'NO_LIBJINGLE_LOGGING', + ], + }], ], }, 'all_dependent_settings': { diff --git a/third_party/libjingle/overrides/talk/base/logging.h b/third_party/libjingle/overrides/talk/base/logging.h index 2d058e6..1a865af 100644 --- a/third_party/libjingle/overrides/talk/base/logging.h +++ b/third_party/libjingle/overrides/talk/base/logging.h @@ -263,7 +263,7 @@ void LogMultiline(LoggingSeverity level, const char* label, bool input, // If LOGGING is not explicitly defined, default to enabled in debug mode #if defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS) #if !defined(LOGGING) -#if defined(_DEBUG) && !defined(NDEBUG) +#if defined(_DEBUG) && !defined(NDEBUG) && !defined(NO_LIBJINGLE_LOGGING) #define LOGGING 1 #else #define LOGGING 0 |