zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)"

Browse Source 
This reverts commit c3771cc4d37f5573fe53b7c7cff295a4f0f9560f.
(breaks downstream internal project)

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2972463002 .
Cr-Commit-Position: refs/heads/master@{#18873}
This commit is contained in:
Henrik Kjellander
2017-07-01 16:48:15 +02:00
parent dca1e09db7
commit a80c16a67c
631 changed files with 1686 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/pc/test/androidtestinitializer.cc
View File

@ -12,7 +12,7 @@
#include <pthread.h>
#include "webrtc/rtc_base/ignore_wundef.h"
#include "webrtc/base/ignore_wundef.h"
// Note: this dependency is dangerous since it reaches into Chromium's base.
// There's a risk of e.g. macro clashes. This file may only be used in tests.
@ -22,9 +22,9 @@ RTC_PUSH_IGNORING_WUNDEF()
#include "base/android/jni_android.h"
RTC_POP_IGNORING_WUNDEF()
#include "webrtc/base/checks.h"
#include "webrtc/base/ssladapter.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/ssladapter.h"
namespace webrtc {