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/sdk/android/src/jni/DEPS b/sdk/android/src/jni/DEPS
index 382b404..4ac0aac 100644
--- a/sdk/android/src/jni/DEPS
+++ b/sdk/android/src/jni/DEPS
@@ -1,15 +1,15 @@
include_rules = [
"+third_party/libyuv",
- "+webrtc/call/callfactoryinterface.h",
- "+webrtc/common_video",
- "+webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h",
- "+webrtc/media/base",
- "+webrtc/media/engine",
- "+webrtc/modules/audio_processing/include/audio_processing.h",
- "+webrtc/modules/include",
- "+webrtc/modules/utility/include/jvm_android.h",
- "+webrtc/modules/video_coding",
- "+webrtc/pc",
- "+webrtc/system_wrappers/include",
- "+webrtc/voice_engine/include/voe_base.h",
+ "+call/callfactoryinterface.h",
+ "+common_video",
+ "+logging/rtc_event_log/rtc_event_log_factory_interface.h",
+ "+media/base",
+ "+media/engine",
+ "+modules/audio_processing/include/audio_processing.h",
+ "+modules/include",
+ "+modules/utility/include/jvm_android.h",
+ "+modules/video_coding",
+ "+pc",
+ "+system_wrappers/include",
+ "+voice_engine/include/voe_base.h",
]
diff --git a/sdk/android/src/jni/androidhistogram_jni.cc b/sdk/android/src/jni/androidhistogram_jni.cc
index c21b346..2b05d8d 100644
--- a/sdk/android/src/jni/androidhistogram_jni.cc
+++ b/sdk/android/src/jni/androidhistogram_jni.cc
@@ -11,9 +11,9 @@
#include <map>
#include <memory>
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/system_wrappers/include/metrics.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "system_wrappers/include/metrics.h"
// Enables collection of native histograms and creating them.
namespace webrtc {
diff --git a/sdk/android/src/jni/androidmediacodeccommon.h b/sdk/android/src/jni/androidmediacodeccommon.h
index 08224ee..62d4862 100644
--- a/sdk/android/src/jni/androidmediacodeccommon.h
+++ b/sdk/android/src/jni/androidmediacodeccommon.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
#include <android/log.h>
#include <string>
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/thread.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -86,4 +86,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
diff --git a/sdk/android/src/jni/androidmediadecoder_jni.cc b/sdk/android/src/jni/androidmediadecoder_jni.cc
index dec35ec..4c14e32 100644
--- a/sdk/android/src/jni/androidmediadecoder_jni.cc
+++ b/sdk/android/src/jni/androidmediadecoder_jni.cc
@@ -15,25 +15,25 @@
// NOTICE: androidmediadecoder_jni.h must be included before
// androidmediacodeccommon.h to avoid build errors.
-#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
+#include "sdk/android/src/jni/androidmediadecoder_jni.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/common_video/h264/h264_bitstream_parser.h"
-#include "webrtc/common_video/include/i420_buffer_pool.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
+#include "common_video/h264/h264_bitstream_parser.h"
+#include "common_video/include/i420_buffer_pool.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/utility/vp8_header_parser.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
+#include "sdk/android/src/jni/androidmediacodeccommon.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
+#include "sdk/android/src/jni/surfacetexturehelper_jni.h"
using rtc::Bind;
using rtc::Thread;
diff --git a/sdk/android/src/jni/androidmediadecoder_jni.h b/sdk/android/src/jni/androidmediadecoder_jni.h
index b971647..bcdf9cc 100644
--- a/sdk/android/src/jni/androidmediadecoder_jni.h
+++ b/sdk/android/src/jni/androidmediadecoder_jni.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
namespace webrtc {
namespace jni {
@@ -39,4 +39,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_
diff --git a/sdk/android/src/jni/androidmediaencoder_jni.cc b/sdk/android/src/jni/androidmediaencoder_jni.cc
index 7c40dac..db96366 100644
--- a/sdk/android/src/jni/androidmediaencoder_jni.cc
+++ b/sdk/android/src/jni/androidmediaencoder_jni.cc
@@ -10,7 +10,7 @@
// NOTICE: androidmediaencoder_jni.h must be included before
// androidmediacodeccommon.h to avoid build errors.
-#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
+#include "sdk/android/src/jni/androidmediaencoder_jni.h"
#include <algorithm>
#include <list>
@@ -21,30 +21,30 @@
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/h264/h264_bitstream_parser.h"
-#include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/common_video/h264/profile_level_id.h"
-#include "webrtc/media/engine/internalencoderfactory.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
-#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
-#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/weak_ptr.h"
-#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h"
+#include "common_video/h264/h264_bitstream_parser.h"
+#include "common_video/h264/h264_common.h"
+#include "common_video/h264/profile_level_id.h"
+#include "media/engine/internalencoderfactory.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/utility/quality_scaler.h"
+#include "modules/video_coding/utility/vp8_header_parser.h"
+#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/random.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "rtc_base/task_queue.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
+#include "rtc_base/weak_ptr.h"
+#include "sdk/android/src/jni/androidmediacodeccommon.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
+#include "system_wrappers/include/field_trial.h"
using rtc::Bind;
using rtc::Thread;
diff --git a/sdk/android/src/jni/androidmediaencoder_jni.h b/sdk/android/src/jni/androidmediaencoder_jni.h
index 4b3be4e..06d1fb4 100644
--- a/sdk/android/src/jni/androidmediaencoder_jni.h
+++ b/sdk/android/src/jni/androidmediaencoder_jni.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_
#include <vector>
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
namespace webrtc {
namespace jni {
@@ -44,4 +44,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_
diff --git a/sdk/android/src/jni/androidmetrics_jni.cc b/sdk/android/src/jni/androidmetrics_jni.cc
index a4eb33b..cdcc294 100644
--- a/sdk/android/src/jni/androidmetrics_jni.cc
+++ b/sdk/android/src/jni/androidmetrics_jni.cc
@@ -11,10 +11,10 @@
#include <map>
#include <memory>
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
// Enables collection of native histograms and creating them.
namespace webrtc {
diff --git a/sdk/android/src/jni/androidnetworkmonitor_jni.h b/sdk/android/src/jni/androidnetworkmonitor_jni.h
index c72b9d0..d8a11aa 100644
--- a/sdk/android/src/jni/androidnetworkmonitor_jni.h
+++ b/sdk/android/src/jni/androidnetworkmonitor_jni.h
@@ -11,4 +11,4 @@
// TODO(deadbeef): Remove this file when clients are updated to new include
// path.
-#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
+#include "sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
diff --git a/sdk/android/src/jni/androidvideotracksource.cc b/sdk/android/src/jni/androidvideotracksource.cc
index 4c4e87e..e5bfcaf 100644
--- a/sdk/android/src/jni/androidvideotracksource.cc
+++ b/sdk/android/src/jni/androidvideotracksource.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
#include <utility>
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace {
// MediaCodec wants resolution to be divisible by 2.
diff --git a/sdk/android/src/jni/androidvideotracksource.h b/sdk/android/src/jni/androidvideotracksource.h
index 3608d02..fca4148 100644
--- a/sdk/android/src/jni/androidvideotracksource.h
+++ b/sdk/android/src/jni/androidvideotracksource.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
-#define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
+#ifndef API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
+#define API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
#include <jni.h>
-#include "webrtc/common_video/include/i420_buffer_pool.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/media/base/adaptedvideotracksource.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/thread_checker.h"
-#include "webrtc/rtc_base/timestampaligner.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
+#include "common_video/include/i420_buffer_pool.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "media/base/adaptedvideotracksource.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/thread_checker.h"
+#include "rtc_base/timestampaligner.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
+#include "sdk/android/src/jni/surfacetexturehelper_jni.h"
namespace webrtc {
namespace jni {
@@ -93,4 +93,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
+#endif // API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
diff --git a/sdk/android/src/jni/androidvideotracksource_jni.cc b/sdk/android/src/jni/androidvideotracksource_jni.cc
index fc9f3b2..ae49e89 100644
--- a/sdk/android/src/jni/androidvideotracksource_jni.cc
+++ b/sdk/android/src/jni/androidvideotracksource_jni.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "api/video/video_rotation.h"
+#include "api/videosourceproxy.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/classreferenceholder.cc b/sdk/android/src/jni/classreferenceholder.cc
index 7648798..1319f4c 100644
--- a/sdk/android/src/jni/classreferenceholder.cc
+++ b/sdk/android/src/jni/classreferenceholder.cc
@@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/classreferenceholder.h b/sdk/android/src/jni/classreferenceholder.h
index 646725a..7d8658b 100644
--- a/sdk/android/src/jni/classreferenceholder.h
+++ b/sdk/android/src/jni/classreferenceholder.h
@@ -13,8 +13,8 @@
// stack. Consequently, we only look up all classes once in app/webrtc.
// http://developer.android.com/training/articles/perf-jni.html#faq_FindClass
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#define SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
#include <jni.h>
#include <map>
@@ -43,4 +43,4 @@
} // namespace webrtc_jni
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#endif // SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
diff --git a/sdk/android/src/jni/filevideocapturer_jni.cc b/sdk/android/src/jni/filevideocapturer_jni.cc
index 059dbef..b5b5c55 100644
--- a/sdk/android/src/jni/filevideocapturer_jni.cc
+++ b/sdk/android/src/jni/filevideocapturer_jni.cc
@@ -11,8 +11,8 @@
#include <jni.h>
#include "third_party/libyuv/include/libyuv/convert_from.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc
index 3a34ba3..ffab333 100644
--- a/sdk/android/src/jni/jni_common.cc
+++ b/sdk/android/src/jni/jni_common.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "rtc_base/refcount.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc_jni {
diff --git a/sdk/android/src/jni/jni_helpers.cc b/sdk/android/src/jni/jni_helpers.cc
index 0384766..5628bfa 100644
--- a/sdk/android/src/jni/jni_helpers.cc
+++ b/sdk/android/src/jni/jni_helpers.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/jni_helpers.h"
#include <asm/unistd.h>
#include <sys/prctl.h>
@@ -15,7 +15,7 @@
#include <unistd.h>
#include <vector>
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/jni_helpers.h b/sdk/android/src/jni/jni_helpers.h
index 83f2155..252cfd0 100644
--- a/sdk/android/src/jni/jni_helpers.h
+++ b/sdk/android/src/jni/jni_helpers.h
@@ -11,17 +11,17 @@
// This file contain convenience functions and classes for JNI.
// Before using any of the methods, InitGlobalJniVariables must be called.
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
+#ifndef SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
+#define SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
#include <jni.h>
#include <map>
#include <string>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/thread_checker.h"
// Abort the process if |jni| has a Java exception pending.
// This macros uses the comma operator to execute ExceptionDescribe
@@ -226,4 +226,4 @@
} // namespace webrtc_jni
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
+#endif // SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
diff --git a/sdk/android/src/jni/jni_onload.cc b/sdk/android/src/jni/jni_onload.cc
index 8794c12..81cc488 100644
--- a/sdk/android/src/jni/jni_onload.cc
+++ b/sdk/android/src/jni/jni_onload.cc
@@ -12,9 +12,9 @@
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.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/sdk/android/src/jni/native_handle_impl.cc b/sdk/android/src/jni/native_handle_impl.cc
index 910235c..30d107c 100644
--- a/sdk/android/src/jni/native_handle_impl.cc
+++ b/sdk/android/src/jni/native_handle_impl.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
#include <memory>
-#include "webrtc/common_video/include/video_frame_buffer.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/keep_ref_until_done.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.h"
-#include "webrtc/system_wrappers/include/aligned_malloc.h"
+#include "common_video/include/video_frame_buffer.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/keep_ref_until_done.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/timeutils.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/wrapped_native_i420_buffer.h"
+#include "system_wrappers/include/aligned_malloc.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/native_handle_impl.h b/sdk/android/src/jni/native_handle_impl.h
index 3ad1b6a..10c0d19 100644
--- a/sdk/android/src/jni/native_handle_impl.h
+++ b/sdk/android/src/jni/native_handle_impl.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_
+#ifndef SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_
+#define SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_
#include <jni.h>
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/rtc_base/callback.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_rotation.h"
+#include "rtc_base/callback.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -194,4 +194,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_
+#endif // SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_
diff --git a/sdk/android/src/jni/nv12buffer_jni.cc b/sdk/android/src/jni/nv12buffer_jni.cc
index 37eb335..bc11b93 100644
--- a/sdk/android/src/jni/nv12buffer_jni.cc
+++ b/sdk/android/src/jni/nv12buffer_jni.cc
@@ -14,7 +14,7 @@
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/scale.h"
-#include "webrtc/rtc_base/checks.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/nv21buffer_jni.cc b/sdk/android/src/jni/nv21buffer_jni.cc
index f8ab903..2e107d7 100644
--- a/sdk/android/src/jni/nv21buffer_jni.cc
+++ b/sdk/android/src/jni/nv21buffer_jni.cc
@@ -14,8 +14,8 @@
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/scale.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/rtc_base/checks.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
index c0f6bd5..662f6cb 100644
--- a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
+++ b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
+#include "sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
#include <dlfcn.h>
// This was added in Lollipop to dlfcn.h
#define RTLD_NOLOAD 4
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/ipaddress.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/ipaddress.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h
index 71f2528..70e3acd 100644
--- a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h
+++ b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
#include <stdint.h>
#include <map>
#include <string>
#include <vector>
-#include "webrtc/rtc_base/networkmonitor.h"
-#include "webrtc/rtc_base/thread_checker.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "rtc_base/networkmonitor.h"
+#include "rtc_base/thread_checker.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -104,4 +104,4 @@
} // namespace webrtc_jni
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
diff --git a/sdk/android/src/jni/pc/audio_jni.cc b/sdk/android/src/jni/pc/audio_jni.cc
index 6bd7df5..cc73ea2 100644
--- a/sdk/android/src/jni/pc/audio_jni.cc
+++ b/sdk/android/src/jni/pc/audio_jni.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/audio_jni.h"
+#include "sdk/android/src/jni/pc/audio_jni.h"
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/audio_jni.h b/sdk/android/src/jni/pc/audio_jni.h
index 477054e..06d2c3d 100644
--- a/sdk/android/src/jni/pc/audio_jni.h
+++ b/sdk/android/src/jni/pc/audio_jni.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_
// Adding 'nogncheck' to disable the gn include headers check.
// We don't want this target depend on audio related targets
-#include "webrtc/api/audio_codecs/audio_decoder_factory.h" // nogncheck
-#include "webrtc/api/audio_codecs/audio_encoder_factory.h" // nogncheck
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "api/audio_codecs/audio_decoder_factory.h" // nogncheck
+#include "api/audio_codecs/audio_encoder_factory.h" // nogncheck
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
namespace jni {
@@ -27,4 +27,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_
diff --git a/sdk/android/src/jni/pc/audiotrack_jni.cc b/sdk/android/src/jni/pc/audiotrack_jni.cc
index 99a272b..9662a68 100644
--- a/sdk/android/src/jni/pc/audiotrack_jni.cc
+++ b/sdk/android/src/jni/pc/audiotrack_jni.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/mediastreaminterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc b/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc
index 739dcaa..868e4a8 100644
--- a/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc
+++ b/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/logsinks.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "rtc_base/logsinks.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/datachannel_jni.cc b/sdk/android/src/jni/pc/datachannel_jni.cc
index ba28f9b..a4e3cb6 100644
--- a/sdk/android/src/jni/pc/datachannel_jni.cc
+++ b/sdk/android/src/jni/pc/datachannel_jni.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h"
+#include "api/datachannelinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/datachannelobserver_jni.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/datachannelobserver_jni.cc b/sdk/android/src/jni/pc/datachannelobserver_jni.cc
index 32bbab0..1ca8932 100644
--- a/sdk/android/src/jni/pc/datachannelobserver_jni.cc
+++ b/sdk/android/src/jni/pc/datachannelobserver_jni.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h"
+#include "sdk/android/src/jni/pc/datachannelobserver_jni.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/datachannelobserver_jni.h b/sdk/android/src/jni/pc/datachannelobserver_jni.h
index a9106a2..dcea9de 100644
--- a/sdk/android/src/jni/pc/datachannelobserver_jni.h
+++ b/sdk/android/src/jni/pc/datachannelobserver_jni.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/datachannelinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -41,4 +41,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_
diff --git a/sdk/android/src/jni/pc/dtmfsender_jni.cc b/sdk/android/src/jni/pc/dtmfsender_jni.cc
index 20c0ea7..a21314a 100644
--- a/sdk/android/src/jni/pc/dtmfsender_jni.cc
+++ b/sdk/android/src/jni/pc/dtmfsender_jni.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/dtmfsenderinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/dtmfsenderinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/java_native_conversion.cc b/sdk/android/src/jni/pc/java_native_conversion.cc
index 1d1a2e5..e500f34 100644
--- a/sdk/android/src/jni/pc/java_native_conversion.cc
+++ b/sdk/android/src/jni/pc/java_native_conversion.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
#include <string>
-#include "webrtc/pc/webrtcsdp.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "pc/webrtcsdp.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/java_native_conversion.h b/sdk/android/src/jni/pc/java_native_conversion.h
index dc91c13..73e1eef 100644
--- a/sdk/android/src/jni/pc/java_native_conversion.h
+++ b/sdk/android/src/jni/pc/java_native_conversion.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_
+#define SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_
#include <vector>
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/api/jsep.h"
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/mediatypes.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/rtpparameters.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/datachannelinterface.h"
+#include "api/jsep.h"
+#include "api/jsepicecandidate.h"
+#include "api/mediastreaminterface.h"
+#include "api/mediatypes.h"
+#include "api/peerconnectioninterface.h"
+#include "api/rtpparameters.h"
+#include "rtc_base/sslidentity.h"
+#include "sdk/android/src/jni/jni_helpers.h"
// This file contains helper methods for converting between simple C++ and Java
// PeerConnection-related structures. Similar to some methods in jni_helpers.h,
@@ -108,4 +108,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_
diff --git a/sdk/android/src/jni/pc/logging_jni.cc b/sdk/android/src/jni/pc/logging_jni.cc
index e71670a..2b3d9d6 100644
--- a/sdk/android/src/jni/pc/logging_jni.cc
+++ b/sdk/android/src/jni/pc/logging_jni.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/system_wrappers/include/logcat_trace_context.h"
-#include "webrtc/system_wrappers/include/trace.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "system_wrappers/include/logcat_trace_context.h"
+#include "system_wrappers/include/trace.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/media_jni.cc b/sdk/android/src/jni/pc/media_jni.cc
index 8d8b6b9..ec8ab49 100644
--- a/sdk/android/src/jni/pc/media_jni.cc
+++ b/sdk/android/src/jni/pc/media_jni.cc
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/media_jni.h"
+#include "sdk/android/src/jni/pc/media_jni.h"
-#include "webrtc/call/callfactoryinterface.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "call/callfactoryinterface.h"
+#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
+#include "media/engine/webrtcmediaengine.h"
+#include "modules/audio_processing/include/audio_processing.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/media_jni.h b/sdk/android/src/jni/pc/media_jni.h
index 02c3a80..64afac4 100644
--- a/sdk/android/src/jni/pc/media_jni.h
+++ b/sdk/android/src/jni/pc/media_jni.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
class AudioDeviceModule;
@@ -45,4 +45,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_
diff --git a/sdk/android/src/jni/pc/mediaconstraints_jni.cc b/sdk/android/src/jni/pc/mediaconstraints_jni.cc
index f36401d..5f0b1d5 100644
--- a/sdk/android/src/jni/pc/mediaconstraints_jni.cc
+++ b/sdk/android/src/jni/pc/mediaconstraints_jni.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
+#include "sdk/android/src/jni/pc/mediaconstraints_jni.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/mediaconstraints_jni.h b/sdk/android/src/jni/pc/mediaconstraints_jni.h
index 9828234..ec21f43 100644
--- a/sdk/android/src/jni/pc/mediaconstraints_jni.h
+++ b/sdk/android/src/jni/pc/mediaconstraints_jni.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/mediaconstraintsinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -42,4 +42,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_
diff --git a/sdk/android/src/jni/pc/mediasource_jni.cc b/sdk/android/src/jni/pc/mediasource_jni.cc
index 6c3c230..e753223 100644
--- a/sdk/android/src/jni/pc/mediasource_jni.cc
+++ b/sdk/android/src/jni/pc/mediasource_jni.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/mediastreaminterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/mediastream_jni.cc b/sdk/android/src/jni/pc/mediastream_jni.cc
index 74dc2c5..a56802a 100644
--- a/sdk/android/src/jni/pc/mediastream_jni.cc
+++ b/sdk/android/src/jni/pc/mediastream_jni.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/mediastreaminterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/mediastreamtrack_jni.cc b/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
index e5af865..f570881 100644
--- a/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
+++ b/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/mediastreaminterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/null_audio_jni.cc b/sdk/android/src/jni/pc/null_audio_jni.cc
index 85c9798..7c508f5 100644
--- a/sdk/android/src/jni/pc/null_audio_jni.cc
+++ b/sdk/android/src/jni/pc/null_audio_jni.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/audio_jni.h"
+#include "sdk/android/src/jni/pc/audio_jni.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/null_media_jni.cc b/sdk/android/src/jni/pc/null_media_jni.cc
index 2f2ff6d..1c44db0 100644
--- a/sdk/android/src/jni/pc/null_media_jni.cc
+++ b/sdk/android/src/jni/pc/null_media_jni.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/media_jni.h"
+#include "sdk/android/src/jni/pc/media_jni.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/null_video_jni.cc b/sdk/android/src/jni/pc/null_video_jni.cc
index b9bf8de..818cc9c 100644
--- a/sdk/android/src/jni/pc/null_video_jni.cc
+++ b/sdk/android/src/jni/pc/null_video_jni.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/video_jni.h"
+#include "sdk/android/src/jni/pc/video_jni.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/ownedfactoryandthreads.cc b/sdk/android/src/jni/pc/ownedfactoryandthreads.cc
index 062270c..39e2bd9 100644
--- a/sdk/android/src/jni/pc/ownedfactoryandthreads.cc
+++ b/sdk/android/src/jni/pc/ownedfactoryandthreads.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h"
+#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/ownedfactoryandthreads.h b/sdk/android/src/jni/pc/ownedfactoryandthreads.h
index ce69c12..c73d7d7 100644
--- a/sdk/android/src/jni/pc/ownedfactoryandthreads.h
+++ b/sdk/android/src/jni/pc/ownedfactoryandthreads.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#define SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
#include <jni.h>
#include <memory>
#include <utility>
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/peerconnectioninterface.h"
+#include "rtc_base/thread.h"
using cricket::WebRtcVideoDecoderFactory;
using cricket::WebRtcVideoEncoderFactory;
@@ -78,4 +78,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
diff --git a/sdk/android/src/jni/pc/peerconnection_jni.cc b/sdk/android/src/jni/pc/peerconnection_jni.cc
index 1e83435..7cb693e 100644
--- a/sdk/android/src/jni/pc/peerconnection_jni.cc
+++ b/sdk/android/src/jni/pc/peerconnection_jni.cc
@@ -29,21 +29,21 @@
#include <memory>
#include <utility>
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
-#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
-#include "webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/statsobserver_jni.h"
-#include "webrtc/system_wrappers/include/trace.h"
+#include "api/mediaconstraintsinterface.h"
+#include "api/peerconnectioninterface.h"
+#include "api/rtpreceiverinterface.h"
+#include "api/rtpsenderinterface.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
+#include "sdk/android/src/jni/pc/mediaconstraints_jni.h"
+#include "sdk/android/src/jni/pc/peerconnectionobserver_jni.h"
+#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
+#include "sdk/android/src/jni/pc/sdpobserver_jni.h"
+#include "sdk/android/src/jni/pc/statsobserver_jni.h"
+#include "system_wrappers/include/trace.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
index e9e8020..d1aea83 100644
--- a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
+++ b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
@@ -11,26 +11,26 @@
#include <memory>
#include <utility>
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/media/base/mediaengine.h"
-#include "webrtc/modules/utility/include/jvm_android.h"
-#include "webrtc/rtc_base/event_tracer.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/audio_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
-#include "webrtc/sdk/android/src/jni/pc/media_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h"
-#include "webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/video_jni.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "api/peerconnectioninterface.h"
+#include "media/base/mediaengine.h"
+#include "modules/utility/include/jvm_android.h"
+#include "rtc_base/event_tracer.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/thread.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
+#include "sdk/android/src/jni/pc/audio_jni.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
+#include "sdk/android/src/jni/pc/media_jni.h"
+#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
+#include "sdk/android/src/jni/pc/peerconnectionobserver_jni.h"
+#include "sdk/android/src/jni/pc/video_jni.h"
+#include "system_wrappers/include/field_trial.h"
// Adding 'nogncheck' to disable the gn include headers check.
// We don't want to depend on 'system_wrappers:field_trial_default' because
// clients should be able to provide their own implementation.
-#include "webrtc/system_wrappers/include/field_trial_default.h" // nogncheck
-#include "webrtc/system_wrappers/include/trace.h"
+#include "system_wrappers/include/field_trial_default.h" // nogncheck
+#include "system_wrappers/include/trace.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc b/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
index d65c95c..a2f9791 100644
--- a/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
+++ b/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h"
+#include "sdk/android/src/jni/pc/peerconnectionobserver_jni.h"
#include <string>
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/peerconnectionobserver_jni.h b/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
index d543b35..eaf7f43 100644
--- a/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
+++ b/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
#include <map>
#include <memory>
#include <vector>
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
+#include "api/peerconnectioninterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/mediaconstraints_jni.h"
namespace webrtc {
namespace jni {
@@ -92,4 +92,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
diff --git a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
index 5be96f5..f383b4d 100644
--- a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
+++ b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
+#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
#include <string>
#include <vector>
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
index 5727074..3a86f98 100644
--- a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
+++ b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
#include <jni.h>
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/peerconnectioninterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -61,4 +61,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
diff --git a/sdk/android/src/jni/pc/rtpreceiver_jni.cc b/sdk/android/src/jni/pc/rtpreceiver_jni.cc
index 2a4ed95..521ea60 100644
--- a/sdk/android/src/jni/pc/rtpreceiver_jni.cc
+++ b/sdk/android/src/jni/pc/rtpreceiver_jni.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
-#include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
+#include "api/rtpreceiverinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
+#include "sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc
index 89a348f..8e90063 100644
--- a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc
+++ b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
+#include "sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h
index ef58f97..c645533 100644
--- a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h
+++ b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/rtpreceiverinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -36,4 +36,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_
diff --git a/sdk/android/src/jni/pc/rtpsender_jni.cc b/sdk/android/src/jni/pc/rtpsender_jni.cc
index 8cd1dcc..e307480 100644
--- a/sdk/android/src/jni/pc/rtpsender_jni.cc
+++ b/sdk/android/src/jni/pc/rtpsender_jni.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
+#include "api/rtpsenderinterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/java_native_conversion.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/sdpobserver_jni.h b/sdk/android/src/jni/pc/sdpobserver_jni.h
index 14b9575..b330b69 100644
--- a/sdk/android/src/jni/pc/sdpobserver_jni.h
+++ b/sdk/android/src/jni/pc/sdpobserver_jni.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
#include <memory>
#include <string>
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
+#include "api/peerconnectioninterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/mediaconstraints_jni.h"
namespace webrtc {
namespace jni {
@@ -106,4 +106,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
diff --git a/sdk/android/src/jni/pc/statsobserver_jni.cc b/sdk/android/src/jni/pc/statsobserver_jni.cc
index f72d1ae..1c7f873 100644
--- a/sdk/android/src/jni/pc/statsobserver_jni.cc
+++ b/sdk/android/src/jni/pc/statsobserver_jni.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/pc/statsobserver_jni.h"
+#include "sdk/android/src/jni/pc/statsobserver_jni.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/statsobserver_jni.h b/sdk/android/src/jni/pc/statsobserver_jni.h
index 1543040..d1e2224 100644
--- a/sdk/android/src/jni/pc/statsobserver_jni.h
+++ b/sdk/android/src/jni/pc/statsobserver_jni.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "api/peerconnectioninterface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -41,4 +41,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_
diff --git a/sdk/android/src/jni/pc/video_jni.cc b/sdk/android/src/jni/pc/video_jni.cc
index 3172b13..c7eb352 100644
--- a/sdk/android/src/jni/pc/video_jni.cc
+++ b/sdk/android/src/jni/pc/video_jni.cc
@@ -10,18 +10,18 @@
#include <jni.h>
-#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
-#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
-#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
-#include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "api/videosourceproxy.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/androidmediadecoder_jni.h"
+#include "sdk/android/src/jni/androidmediaencoder_jni.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
+#include "sdk/android/src/jni/surfacetexturehelper_jni.h"
+#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
+#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/video_jni.h b/sdk/android/src/jni/pc/video_jni.h
index 016ce0a..0c2ccda 100644
--- a/sdk/android/src/jni/pc/video_jni.h
+++ b/sdk/android/src/jni/pc/video_jni.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_
+#define SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_
#include <jni.h>
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace cricket {
class WebRtcVideoEncoderFactory;
@@ -39,4 +39,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_
diff --git a/sdk/android/src/jni/surfacetexturehelper_jni.cc b/sdk/android/src/jni/surfacetexturehelper_jni.cc
index cfc2904..9a97adc 100644
--- a/sdk/android/src/jni/surfacetexturehelper_jni.cc
+++ b/sdk/android/src/jni/surfacetexturehelper_jni.cc
@@ -9,12 +9,12 @@
*/
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
+#include "sdk/android/src/jni/surfacetexturehelper_jni.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/surfacetexturehelper_jni.h b/sdk/android/src/jni/surfacetexturehelper_jni.h
index 82e36cf..f96c893 100644
--- a/sdk/android/src/jni/surfacetexturehelper_jni.h
+++ b/sdk/android/src/jni/surfacetexturehelper_jni.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_
+#ifndef SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_
+#define SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_
#include <jni.h>
-#include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "api/video/video_frame_buffer.h"
+#include "rtc_base/refcount.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
namespace webrtc {
namespace jni {
@@ -67,4 +67,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_
+#endif // SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_
diff --git a/sdk/android/src/jni/video_renderer_jni.cc b/sdk/android/src/jni/video_renderer_jni.cc
index 07244bc..4bd5159 100644
--- a/sdk/android/src/jni/video_renderer_jni.cc
+++ b/sdk/android/src/jni/video_renderer_jni.cc
@@ -10,11 +10,11 @@
#include <jni.h>
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "api/video/video_frame.h"
+#include "media/base/videosinkinterface.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videodecoderfactorywrapper.cc b/sdk/android/src/jni/videodecoderfactorywrapper.cc
index dba8fe2..dc2e954 100644
--- a/sdk/android/src/jni/videodecoderfactorywrapper.cc
+++ b/sdk/android/src/jni/videodecoderfactorywrapper.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
+#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/common_types.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
+#include "api/video_codecs/video_decoder.h"
+#include "common_types.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/videodecoderwrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videodecoderfactorywrapper.h b/sdk/android/src/jni/videodecoderfactorywrapper.h
index 43c86cb..99f495d 100644
--- a/sdk/android/src/jni/videodecoderfactorywrapper.h
+++ b/sdk/android/src/jni/videodecoderfactorywrapper.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
#include <jni.h>
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -38,4 +38,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
diff --git a/sdk/android/src/jni/videodecoderwrapper.cc b/sdk/android/src/jni/videodecoderwrapper.cc
index 23a8314..4dfbf93 100644
--- a/sdk/android/src/jni/videodecoderwrapper.cc
+++ b/sdk/android/src/jni/videodecoderwrapper.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/videodecoderwrapper.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
-#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "api/video/video_frame.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/utility/vp8_header_parser.h"
+#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/timeutils.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videodecoderwrapper.h b/sdk/android/src/jni/videodecoderwrapper.h
index c737456..2da6892 100644
--- a/sdk/android/src/jni/videodecoderwrapper.h
+++ b/sdk/android/src/jni/videodecoderwrapper.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
#include <jni.h>
#include <deque>
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/common_video/h264/h264_bitstream_parser.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "api/video_codecs/video_decoder.h"
+#include "common_video/h264/h264_bitstream_parser.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
namespace webrtc {
namespace jni {
@@ -118,4 +118,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
diff --git a/sdk/android/src/jni/videoencoderfactorywrapper.cc b/sdk/android/src/jni/videoencoderfactorywrapper.cc
index 138d863..c33edbb 100644
--- a/sdk/android/src/jni/videoencoderfactorywrapper.cc
+++ b/sdk/android/src/jni/videoencoderfactorywrapper.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/common_types.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/videoencoderwrapper.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/videoencoderwrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videoencoderfactorywrapper.h b/sdk/android/src/jni/videoencoderfactorywrapper.h
index 03d054d..509f51b 100644
--- a/sdk/android/src/jni/videoencoderfactorywrapper.h
+++ b/sdk/android/src/jni/videoencoderfactorywrapper.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
#include <jni.h>
#include <vector>
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
@@ -62,4 +62,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc
index 2b87d67..ceecda2 100644
--- a/sdk/android/src/jni/videoencoderwrapper.cc
+++ b/sdk/android/src/jni/videoencoderwrapper.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/videoencoderwrapper.h"
#include <utility>
-#include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
-#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
+#include "common_video/h264/h264_common.h"
+#include "modules/include/module_common_types.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "modules/video_coding/utility/vp8_header_parser.h"
+#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/random.h"
+#include "rtc_base/timeutils.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videoencoderwrapper.h b/sdk/android/src/jni/videoencoderwrapper.h
index afda8d2..4468fcb 100644
--- a/sdk/android/src/jni/videoencoderwrapper.h
+++ b/sdk/android/src/jni/videoencoderwrapper.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
#include <jni.h>
#include <deque>
#include <string>
#include <vector>
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/common_video/h264/h264_bitstream_parser.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_video/h264/h264_bitstream_parser.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
+#include "rtc_base/task_queue.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
namespace webrtc {
namespace jni {
@@ -145,4 +145,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
diff --git a/sdk/android/src/jni/videofilerenderer_jni.cc b/sdk/android/src/jni/videofilerenderer_jni.cc
index 638994d..8effd9d 100644
--- a/sdk/android/src/jni/videofilerenderer_jni.cc
+++ b/sdk/android/src/jni/videofilerenderer_jni.cc
@@ -11,8 +11,8 @@
#include <jni.h>
#include "third_party/libyuv/include/libyuv/scale.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videoframe_jni.cc b/sdk/android/src/jni/videoframe_jni.cc
index f6ba46f..7533f9c 100644
--- a/sdk/android/src/jni/videoframe_jni.cc
+++ b/sdk/android/src/jni/videoframe_jni.cc
@@ -12,7 +12,7 @@
#include "libyuv/scale.h"
-#include "webrtc/rtc_base/checks.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/videotrack_jni.cc b/sdk/android/src/jni/videotrack_jni.cc
index ed22c54..0da609f 100644
--- a/sdk/android/src/jni/videotrack_jni.cc
+++ b/sdk/android/src/jni/videotrack_jni.cc
@@ -10,11 +10,11 @@
#include <jni.h>
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "api/mediastreaminterface.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/native_handle_impl.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/wrapped_native_i420_buffer.cc b/sdk/android/src/jni/wrapped_native_i420_buffer.cc
index 1f26a83..2a09baf 100644
--- a/sdk/android/src/jni/wrapped_native_i420_buffer.cc
+++ b/sdk/android/src/jni/wrapped_native_i420_buffer.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.h"
+#include "sdk/android/src/jni/wrapped_native_i420_buffer.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/classreferenceholder.h"
+#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/wrapped_native_i420_buffer.h b/sdk/android/src/jni/wrapped_native_i420_buffer.h
index 0242877..5de98d8 100644
--- a/sdk/android/src/jni/wrapped_native_i420_buffer.h
+++ b/sdk/android/src/jni/wrapped_native_i420_buffer.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_
+#ifndef SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_
+#define SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_
#include <jni.h>
-#include "webrtc/api/video/video_frame_buffer.h"
+#include "api/video/video_frame_buffer.h"
namespace webrtc {
namespace jni {
@@ -27,4 +27,4 @@
} // namespace jni
} // namespace webrtc
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_
+#endif // SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_