summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 18:46:31 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 18:46:31 +0000
commit311c9ba4feead2a8e67d137c8963ab37b82790ab (patch)
treef37db5c26dd16278443d1740371d563a8588ca8a /third_party
parentc80491fee602ffc74a29b8862e9de80b8002b93c (diff)
downloadchromium_src-311c9ba4feead2a8e67d137c8963ab37b82790ab.zip
chromium_src-311c9ba4feead2a8e67d137c8963ab37b82790ab.tar.gz
chromium_src-311c9ba4feead2a8e67d137c8963ab37b82790ab.tar.bz2
Roll libjingle 63:66.
BUG=84129,57799 TEST=Unittests Review URL: http://codereview.chromium.org/7044123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/libjingle.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index f04091c..f936955 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -26,18 +26,19 @@
'include_dirs': [
'./overrides',
'./source',
- '../../third_party/expat/files'
],
'dependencies': [
'../expat/expat.gyp:expat',
'../../base/base.gyp:base',
'../../net/net.gyp:net',
],
+ 'export_dependent_settings': [
+ '../expat/expat.gyp:expat',
+ ],
'direct_dependent_settings': {
'include_dirs': [
'./overrides',
'./source',
- '../../third_party/expat/files'
],
'defines': [
'FEATURE_ENABLE_SSL',