diff options
| author | kjellander <kjellander@chromium.org> | 2015-10-28 17:10:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 00:11:29 +0000 |
| commit | a3e356f1106df27a08a1418df42ff78fb5eb0ae6 (patch) | |
| tree | a108e7bea844c4712a83659ad53cf091bb160c01 /third_party/libjingle | |
| parent | 0a4c2e1c47c6c44d045cc7cf0a1ce6ae21355012 (diff) | |
| download | chromium_src-a3e356f1106df27a08a1418df42ff78fb5eb0ae6.zip chromium_src-a3e356f1106df27a08a1418df42ff78fb5eb0ae6.tar.gz chromium_src-a3e356f1106df27a08a1418df42ff78fb5eb0ae6.tar.bz2 | |
Roll WebRTC 10435:10438, Libjingle 10434:10439
WebRTC 10435:10438
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/ba22198..78f65d0
Libjingle 10434:10439
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/fe14926..1a5fe30
TBR=tommi@chromium.org
BUG=webrtc:5095
Review URL: https://codereview.chromium.org/1427503007
Cr-Commit-Position: refs/heads/master@{#356696}
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_nacl.gyp | 4 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/init_webrtc.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index bf09885..06519f5 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 10434 +Revision: 10439 License: BSD License File: source/talk/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp index 113cfdb..08f5ad1 100644 --- a/third_party/libjingle/libjingle_nacl.gyp +++ b/third_party/libjingle/libjingle_nacl.gyp @@ -250,8 +250,8 @@ '<(webrtc_xmllite)/xmlparser.h', '<(webrtc_xmllite)/xmlprinter.cc', '<(webrtc_xmllite)/xmlprinter.h', - '<(webrtc_system_wrappers)/interface/field_trial_default.h', - '<(webrtc_system_wrappers)/interface/field_trial.h', + '<(webrtc_system_wrappers)/include/field_trial_default.h', + '<(webrtc_system_wrappers)/include/field_trial.h', '<(webrtc_system_wrappers)/source/field_trial_default.cc', ], 'sources!': [ diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc index 7fbbff7..e1a73ea 100644 --- a/third_party/libjingle/overrides/init_webrtc.cc +++ b/third_party/libjingle/overrides/init_webrtc.cc @@ -13,8 +13,8 @@ #include "base/path_service.h" #include "base/trace_event/trace_event.h" #include "third_party/webrtc_overrides/webrtc/base/logging.h" -#include "third_party/webrtc/system_wrappers/interface/cpu_info.h" -#include "third_party/webrtc/system_wrappers/interface/event_tracer.h" +#include "third_party/webrtc/system_wrappers/include/cpu_info.h" +#include "third_party/webrtc/system_wrappers/include/event_tracer.h" const unsigned char* GetCategoryGroupEnabled(const char* category_group) { return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group); |