diff options
| author | grunell <grunell@chromium.org> | 2015-09-30 07:52:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-30 14:53:34 +0000 |
| commit | d1971c56ac15008bde9caef79e90ace1113be32f (patch) | |
| tree | d9702e8cd89656d809453dca4920549649423f9c /jingle | |
| parent | d32df3f26f9656226eea311363d004a4a33ca868 (diff) | |
| download | chromium_src-d1971c56ac15008bde9caef79e90ace1113be32f.zip chromium_src-d1971c56ac15008bde9caef79e90ace1113be32f.tar.gz chromium_src-d1971c56ac15008bde9caef79e90ace1113be32f.tar.bz2 | |
Update to use third_party/webrtc_overrides instead of third_party/webrtc/overrides.
This is one step in moving the overrides files from WebRTC to Chromium. See bug comment #65 for all steps.
Depends on https://codereview.chromium.org/1345873004/ and a WebRTC roll (specifically https://codereview.webrtc.org/1345313004/).
BUG=468375
Review URL: https://codereview.chromium.org/1357913002
Cr-Commit-Position: refs/heads/master@{#351554}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/DEPS | 3 | ||||
| -rw-r--r-- | jingle/glue/logging_unittest.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jingle/glue/DEPS b/jingle/glue/DEPS index 790c9b7..44fa573 100644 --- a/jingle/glue/DEPS +++ b/jingle/glue/DEPS @@ -2,4 +2,5 @@ include_rules = [ "+third_party/libjingle/overrides", "+third_party/webrtc", -]
\ No newline at end of file + '+third_party/webrtc_overrides', +] diff --git a/jingle/glue/logging_unittest.cc b/jingle/glue/logging_unittest.cc index 9640178..a5613f7 100644 --- a/jingle/glue/logging_unittest.cc +++ b/jingle/glue/logging_unittest.cc @@ -17,7 +17,7 @@ // libjingle style logging is used. #define LOGGING_INSIDE_WEBRTC -#include "third_party/webrtc/overrides/webrtc/base/logging.h" +#include "third_party/webrtc_overrides/webrtc/base/logging.h" #if defined(OS_WIN) static const wchar_t* const log_file_name = L"libjingle_logging.log"; |