From d1971c56ac15008bde9caef79e90ace1113be32f Mon Sep 17 00:00:00 2001 From: grunell Date: Wed, 30 Sep 2015 07:52:39 -0700 Subject: 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} --- jingle/glue/DEPS | 3 ++- jingle/glue/logging_unittest.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'jingle') 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"; -- cgit v1.1