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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 225001: Use base/logging from chrome/browser/sync. Add a macro to libjingle's (Closed)
Patch Set: Added README.chromium Created 11 years, 3 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
« chrome/browser/sync/notifier/gaia_auth/win/win32window.cc ('K') | « third_party/libjingle/files/talk/base/logging.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index dcbfb3f984275dc1de6094fa2ff27f39d202ee03..8372532342f25c2d3f43f2cc76b665de27558116 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -11,6 +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',
],
'include_dirs': [
'./overrides',
@@ -241,9 +242,9 @@
'files/talk/xmpp/xmppstanzaparser.h',
'files/talk/xmpp/xmpptask.cc',
'files/talk/xmpp/xmpptask.h',
- 'overrides/base/basictypes.h',
- 'overrides/base/constructormagic.h',
- 'overrides/base/scoped_ptr.h',
+ 'overrides/talk/base/basictypes.h',
+ 'overrides/talk/base/constructormagic.h',
+ 'overrides/talk/base/scoped_ptr.h',
'overrides/config.h',
],
'conditions': [
« chrome/browser/sync/notifier/gaia_auth/win/win32window.cc ('K') | « third_party/libjingle/files/talk/base/logging.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698