diff options
| author | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 19:00:44 +0000 |
|---|---|---|
| committer | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 19:00:44 +0000 |
| commit | cbf426d5c0530101898dd9b78f462041340f21a5 (patch) | |
| tree | a1904420d8dd4ba9f02017dd76a4f4c3aa22c391 /third_party | |
| parent | 5584bc2e1718e4fb84808c376e95b942aad58c31 (diff) | |
| download | chromium_src-cbf426d5c0530101898dd9b78f462041340f21a5.zip chromium_src-cbf426d5c0530101898dd9b78f462041340f21a5.tar.gz chromium_src-cbf426d5c0530101898dd9b78f462041340f21a5.tar.bz2 | |
Fixes dependency ordering to get libjingle style overrides working for webrtc. See http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Linux/builds/5887/steps/compile/logs/stdio. Tested it locally.
BUG=N/A
R=hellner@chromium.org
Review URL: https://codereview.chromium.org/293983009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_nacl.gyp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index ecd444a..37bbf21 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -41,6 +41,7 @@ 'include_dirs': [ './overrides', './<(libjingle_source)', + '../../third_party/webrtc/overrides', '../..', '../../testing/gtest/include', '../../third_party', @@ -60,6 +61,7 @@ 'include_dirs': [ './overrides', './<(libjingle_source)', + '../../third_party/webrtc/overrides', '../..', '../../testing/gtest/include', '../../third_party', diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp index d665846..4b5737bb 100644 --- a/third_party/libjingle/libjingle_nacl.gyp +++ b/third_party/libjingle/libjingle_nacl.gyp @@ -64,6 +64,7 @@ 'include_dirs': [ './overrides', './<(libjingle_source)', + '../../third_party/webrtc/overrides', '../../testing/gtest/include', '../../third_party', '../../third_party/webrtc', |