Fixing WebRTC after moving from src/webrtc to src/
In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org
Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}
diff --git a/api/DEPS b/api/DEPS
index fad1d84..1e8e347 100644
--- a/api/DEPS
+++ b/api/DEPS
@@ -1,30 +1,30 @@
include_rules = [
"+third_party/libyuv",
- "+webrtc/common_video",
- "+webrtc/media",
- "+webrtc/p2p",
- "+webrtc/pc",
+ "+common_video",
+ "+media",
+ "+p2p",
+ "+pc",
]
specific_include_rules = {
"peerconnection_jni\.cc": [
- "+webrtc/voice_engine",
+ "+voice_engine",
],
# TODO(ossu): Remove this exception when {builtin_,}audio_encoder_factory.h
# has moved to api/.
"peerconnectioninterface\.h": [
- "+webrtc/call/callfactoryinterface.h",
- "+webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h",
- "+webrtc/modules/audio_coding/codecs/audio_encoder_factory.h",
- "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h",
+ "+call/callfactoryinterface.h",
+ "+logging/rtc_event_log/rtc_event_log_factory_interface.h",
+ "+modules/audio_coding/codecs/audio_encoder_factory.h",
+ "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h",
],
# Needed because AudioEncoderOpus is in the wrong place for
# backwards compatibilty reasons. See
# https://bugs.chromium.org/p/webrtc/issues/detail?id=7847
"audio_encoder_opus\.h": [
- "+webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h",
+ "+modules/audio_coding/codecs/opus/audio_encoder_opus.h",
],
# We allow .cc files in webrtc/api/ to #include a bunch of stuff
@@ -32,10 +32,10 @@
# their #includes to whoever's #including them, but .cc files do not
# since no one #includes them.
".*\.cc": [
- "+webrtc/modules/audio_coding",
+ "+modules/audio_coding",
],
".*i420_buffer\.h": [
- "+webrtc/system_wrappers/include/aligned_malloc.h",
+ "+system_wrappers/include/aligned_malloc.h",
],
}