summaryrefslogtreecommitdiffstats
path: root/third_party/libjingle
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 22:44:35 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 22:44:35 +0000
commit88c27afd0b1bff243e2a73ee4f81090ee1896754 (patch)
treeab7ce1fea66769ba84617db79c10e4342cf521c8 /third_party/libjingle
parentd67c9ea53b3b18b16e6664384fae814ad7d0e9c9 (diff)
downloadchromium_src-88c27afd0b1bff243e2a73ee4f81090ee1896754.zip
chromium_src-88c27afd0b1bff243e2a73ee4f81090ee1896754.tar.gz
chromium_src-88c27afd0b1bff243e2a73ee4f81090ee1896754.tar.bz2
Fixes up alignment issue in remoting where subprojects of libjingle had _DEBUG defined even though libjingle itself did not.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2716003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
-rw-r--r--third_party/libjingle/libjingle.gyp5
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index bcf8eb8..96d9104 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -10,6 +10,9 @@
'_USE_32BIT_TIME_T',
'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS',
'EXPAT_RELATIVE_PATH',
+ # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
+ # _DEBUG and remove this define. See below as well.
+ '_DEBUG',
],
'include_dirs': [
'./overrides',
@@ -77,7 +80,7 @@
'Debug': {
'defines': [
# TODO(sergeyu): Fix libjingle to use NDEBUG instead of
- # _DEBUG and remove this define.
+ # _DEBUG and remove this define. See above as well.
'_DEBUG',
],
}