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/examples/unityplugin/DEPS b/examples/unityplugin/DEPS
index ede414b..608c6ad 100644
--- a/examples/unityplugin/DEPS
+++ b/examples/unityplugin/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+webrtc/sdk",
+ "+sdk",
]
diff --git a/examples/unityplugin/classreferenceholder.cc b/examples/unityplugin/classreferenceholder.cc
index b009ce4..0ad96c5 100644
--- a/examples/unityplugin/classreferenceholder.cc
+++ b/examples/unityplugin/classreferenceholder.cc
@@ -7,11 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/examples/unityplugin/classreferenceholder.h"
+#include "examples/unityplugin/classreferenceholder.h"
#include <utility>
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace unity_plugin {
diff --git a/examples/unityplugin/classreferenceholder.h b/examples/unityplugin/classreferenceholder.h
index 7d9a71b..31d6efc 100644
--- a/examples/unityplugin/classreferenceholder.h
+++ b/examples/unityplugin/classreferenceholder.h
@@ -13,8 +13,8 @@
// specific java class into JNI c++ side, so that our c++ code can
// call those java functions.
-#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
-#define WEBRTC_EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#ifndef EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
#include <jni.h>
#include <map>
@@ -34,4 +34,4 @@
} // namespace unity_plugin
-#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#endif // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
diff --git a/examples/unityplugin/jni_onload.cc b/examples/unityplugin/jni_onload.cc
index 558dcfb..ebb5bfa 100644
--- a/examples/unityplugin/jni_onload.cc
+++ b/examples/unityplugin/jni_onload.cc
@@ -12,10 +12,10 @@
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
-#include "webrtc/examples/unityplugin/classreferenceholder.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "examples/unityplugin/classreferenceholder.h"
+#include "rtc_base/ssladapter.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc
index 3f3f3fb..fe59d53 100644
--- a/examples/unityplugin/simple_peer_connection.cc
+++ b/examples/unityplugin/simple_peer_connection.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/examples/unityplugin/simple_peer_connection.h"
+#include "examples/unityplugin/simple_peer_connection.h"
#include <utility>
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/media/engine/webrtcvideocapturerfactory.h"
-#include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "api/test/fakeconstraints.h"
+#include "api/videosourceproxy.h"
+#include "media/engine/webrtcvideocapturerfactory.h"
+#include "modules/video_capture/video_capture_factory.h"
#if defined(WEBRTC_ANDROID)
-#include "webrtc/examples/unityplugin/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "examples/unityplugin/classreferenceholder.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/jni_helpers.h"
#endif
// Names used for media stream labels.
diff --git a/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h
index 15961d8..0c7a261 100644
--- a/examples/unityplugin/simple_peer_connection.h
+++ b/examples/unityplugin/simple_peer_connection.h
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_
-#define WEBRTC_EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_
+#ifndef EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_
+#define EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/examples/unityplugin/unity_plugin_apis.h"
-#include "webrtc/examples/unityplugin/video_observer.h"
+#include "api/datachannelinterface.h"
+#include "api/mediastreaminterface.h"
+#include "api/peerconnectioninterface.h"
+#include "examples/unityplugin/unity_plugin_apis.h"
+#include "examples/unityplugin/video_observer.h"
class SimplePeerConnection : public webrtc::PeerConnectionObserver,
public webrtc::CreateSessionDescriptionObserver,
@@ -133,4 +133,4 @@
SimplePeerConnection& operator=(const SimplePeerConnection&) = delete;
};
-#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_
+#endif // EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_
diff --git a/examples/unityplugin/unity_plugin_apis.cc b/examples/unityplugin/unity_plugin_apis.cc
index 08b3347..ae98a83 100644
--- a/examples/unityplugin/unity_plugin_apis.cc
+++ b/examples/unityplugin/unity_plugin_apis.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/examples/unityplugin/unity_plugin_apis.h"
+#include "examples/unityplugin/unity_plugin_apis.h"
#include <map>
#include <string>
-#include "webrtc/examples/unityplugin/simple_peer_connection.h"
+#include "examples/unityplugin/simple_peer_connection.h"
namespace {
static int g_peer_connection_id = 1;
diff --git a/examples/unityplugin/unity_plugin_apis.h b/examples/unityplugin/unity_plugin_apis.h
index 529c7d2..814b967 100644
--- a/examples/unityplugin/unity_plugin_apis.h
+++ b/examples/unityplugin/unity_plugin_apis.h
@@ -10,8 +10,8 @@
// This file provides an example of unity native plugin APIs.
-#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_
-#define WEBRTC_EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_
+#ifndef EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_
+#define EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_
#include <stdint.h>
@@ -102,4 +102,4 @@
ICECANDIDATEREADYTOSEND_CALLBACK callback);
}
-#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_
+#endif // EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_
diff --git a/examples/unityplugin/video_observer.cc b/examples/unityplugin/video_observer.cc
index 4f3bd56..821acd6 100644
--- a/examples/unityplugin/video_observer.cc
+++ b/examples/unityplugin/video_observer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/examples/unityplugin/video_observer.h"
+#include "examples/unityplugin/video_observer.h"
void VideoObserver::SetVideoCallback(I420FRAMEREADY_CALLBACK callback) {
std::lock_guard<std::mutex> lock(mutex);
diff --git a/examples/unityplugin/video_observer.h b/examples/unityplugin/video_observer.h
index 9c3c7c6..f2b06b3 100644
--- a/examples/unityplugin/video_observer.h
+++ b/examples/unityplugin/video_observer.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_
-#define WEBRTC_EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_
+#ifndef EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_
+#define EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_
#include <mutex>
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/examples/unityplugin/unity_plugin_apis.h"
-#include "webrtc/media/base/videosinkinterface.h"
+#include "api/mediastreaminterface.h"
+#include "examples/unityplugin/unity_plugin_apis.h"
+#include "media/base/videosinkinterface.h"
class VideoObserver : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
public:
@@ -32,4 +32,4 @@
std::mutex mutex;
};
-#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_
+#endif // EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_