From 0d65fb5451761c5eac1ecef070ce86856b8b7664 Mon Sep 17 00:00:00 2001 From: Eric Stevenson Date: Mon, 24 Jun 2019 13:09:50 -0400 Subject: [PATCH] Mass refactoring: Change JNI #includes to use full paths (webrtc/). Using relative paths for JNI includes is causing build failures in chromium. WebRTC already uses full include paths for generated JNI headers, so this CL just removes the "jni_package" parameter from WebRTC generate_jni() targets and removes the "jni/" portion of includes. The "jni_package" variable will be removed from the generate_jni() template shortly. To fix includes: find . -name *.cc -exec sed -i -E 's@(#include.+generated.+jni)/jni/(.+_jni.h)@\1/\2@' {} \; See https://groups.google.com/a/chromium.org/forum/?#!topic/java/MEovGrAwbqI for discussion on naming scheme. No-Try: True TBR: kwiberg@webrtc.org Bug: chromium:964169 Change-Id: I758c1b41bf6f5005587e55b82f14065fe251baad Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143521 Commit-Queue: Oleh Prypin Reviewed-by: Oleh Prypin Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#28380} --- examples/androidnativeapi/BUILD.gn | 1 - .../jni/android_call_client.cc | 2 +- sdk/android/BUILD.gn | 14 ------------ sdk/android/native_api/jni/class_loader.cc | 2 +- sdk/android/native_api/jni/java_types.cc | 22 +++++++++---------- .../application_context_provider.cc | 2 +- .../audio_device/audio_device_unittest.cc | 2 +- .../codecs/wrapper_unittest.cc | 2 +- .../native_unittests/java_types_unittest.cc | 2 +- .../peer_connection_factory_unittest.cc | 2 +- .../video/video_source_unittest.cc | 2 +- sdk/android/src/jni/android_histogram.cc | 2 +- sdk/android/src/jni/android_media_decoder.cc | 2 +- sdk/android/src/jni/android_media_encoder.cc | 2 +- sdk/android/src/jni/android_metrics.cc | 2 +- .../src/jni/android_network_monitor.cc | 4 ++-- .../src/jni/android_video_track_source.cc | 2 +- .../jni/audio_device/audio_device_module.cc | 2 +- .../src/jni/audio_device/audio_record_jni.cc | 2 +- .../src/jni/audio_device/audio_track_jni.cc | 2 +- .../audio_device/java_audio_device_module.cc | 2 +- .../builtin_audio_decoder_factory_factory.cc | 2 +- .../builtin_audio_encoder_factory_factory.cc | 2 +- sdk/android/src/jni/encoded_image.cc | 2 +- sdk/android/src/jni/h264_utils.cc | 2 +- sdk/android/src/jni/java_i420_buffer.cc | 2 +- sdk/android/src/jni/jni_common.cc | 2 +- sdk/android/src/jni/logging/log_sink.cc | 2 +- .../src/jni/native_capturer_observer.cc | 2 +- sdk/android/src/jni/nv12_buffer.cc | 2 +- sdk/android/src/jni/nv21_buffer.cc | 2 +- sdk/android/src/jni/pc/audio_track.cc | 2 +- .../pc/call_session_file_rotating_log_sink.cc | 2 +- sdk/android/src/jni/pc/crypto_options.cc | 2 +- sdk/android/src/jni/pc/data_channel.cc | 2 +- sdk/android/src/jni/pc/dtmf_sender.cc | 2 +- sdk/android/src/jni/pc/ice_candidate.cc | 2 +- sdk/android/src/jni/pc/media_constraints.cc | 2 +- sdk/android/src/jni/pc/media_source.cc | 2 +- sdk/android/src/jni/pc/media_stream.cc | 2 +- sdk/android/src/jni/pc/media_stream_track.cc | 2 +- sdk/android/src/jni/pc/peer_connection.cc | 2 +- .../src/jni/pc/peer_connection_factory.cc | 2 +- sdk/android/src/jni/pc/rtc_certificate.cc | 2 +- .../rtc_stats_collector_callback_wrapper.cc | 8 +++---- sdk/android/src/jni/pc/rtp_parameters.cc | 2 +- sdk/android/src/jni/pc/rtp_receiver.cc | 2 +- sdk/android/src/jni/pc/rtp_sender.cc | 2 +- sdk/android/src/jni/pc/rtp_transceiver.cc | 2 +- sdk/android/src/jni/pc/sdp_observer.cc | 2 +- sdk/android/src/jni/pc/session_description.cc | 2 +- .../pc/ssl_certificate_verifier_wrapper.cc | 2 +- sdk/android/src/jni/pc/stats_observer.cc | 4 ++-- sdk/android/src/jni/pc/turn_customizer.cc | 2 +- sdk/android/src/jni/timestamp_aligner.cc | 2 +- sdk/android/src/jni/video_codec_info.cc | 2 +- sdk/android/src/jni/video_codec_status.cc | 2 +- .../src/jni/video_decoder_factory_wrapper.cc | 2 +- sdk/android/src/jni/video_decoder_fallback.cc | 2 +- sdk/android/src/jni/video_decoder_wrapper.cc | 4 ++-- .../src/jni/video_encoder_factory_wrapper.cc | 2 +- sdk/android/src/jni/video_encoder_fallback.cc | 2 +- sdk/android/src/jni/video_encoder_wrapper.cc | 4 ++-- sdk/android/src/jni/video_frame.cc | 2 +- sdk/android/src/jni/video_sink.cc | 2 +- sdk/android/src/jni/video_track.cc | 2 +- sdk/android/src/jni/vp8_codec.cc | 4 ++-- sdk/android/src/jni/vp9_codec.cc | 4 ++-- .../src/jni/wrapped_native_i420_buffer.cc | 2 +- sdk/android/src/jni/yuv_helper.cc | 2 +- 70 files changed, 87 insertions(+), 102 deletions(-) diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index 8a06c20a53..58d7b93d11 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -31,7 +31,6 @@ if (is_android) { sources = [ "java/org/webrtc/examples/androidnativeapi/CallClient.java", ] - jni_package = "" namespace = "webrtc_examples" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc index cdcb71e98b..b0ba596f7a 100644 --- a/examples/androidnativeapi/jni/android_call_client.cc +++ b/examples/androidnativeapi/jni/android_call_client.cc @@ -15,7 +15,7 @@ #include "absl/memory/memory.h" #include "api/peer_connection_interface.h" #include "api/task_queue/default_task_queue_factory.h" -#include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h" +#include "examples/androidnativeapi/generated_jni/CallClient_jni.h" #include "logging/rtc_event_log/rtc_event_log_factory.h" #include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_encoder_factory.h" diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 86461e4c0d..ec3fbb8622 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1181,7 +1181,6 @@ if (is_android) { "java/util/ArrayList.class", "java/lang/Enum.class", ] - jni_package = "" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1189,7 +1188,6 @@ if (is_android) { sources = [ "api/org/webrtc/Metrics.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1203,7 +1201,6 @@ if (is_android) { "src/java/org/webrtc/Histogram.java", "src/java/org/webrtc/JniCommon.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1236,7 +1233,6 @@ if (is_android) { "src/java/org/webrtc/VideoEncoderWrapper.java", "src/java/org/webrtc/WrappedNativeI420Buffer.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1247,7 +1243,6 @@ if (is_android) { "api/org/webrtc/LibvpxVp8Encoder.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1258,7 +1253,6 @@ if (is_android) { "api/org/webrtc/LibvpxVp9Encoder.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1292,7 +1286,6 @@ if (is_android) { "api/org/webrtc/StatsReport.java", "api/org/webrtc/TurnCustomizer.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1301,7 +1294,6 @@ if (is_android) { sources = [ "api/org/webrtc/audio/JavaAudioDeviceModule.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1311,7 +1303,6 @@ if (is_android) { "api/org/webrtc/BuiltinAudioDecoderFactoryFactory.java", "api/org/webrtc/BuiltinAudioEncoderFactoryFactory.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1323,7 +1314,6 @@ if (is_android) { "src/java/org/webrtc/JniHelper.java", "src/java/org/webrtc/WebRtcClassLoader.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1334,7 +1324,6 @@ if (is_android) { sources = [ "src/java/org/webrtc/JNILogging.java", ] - jni_package = "" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1342,7 +1331,6 @@ if (is_android) { sources = [ "src/java/org/webrtc/audio/WebRtcAudioManager.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1352,7 +1340,6 @@ if (is_android) { "src/java/org/webrtc/audio/WebRtcAudioRecord.java", "src/java/org/webrtc/audio/WebRtcAudioTrack.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } @@ -1547,7 +1534,6 @@ if (is_android) { "native_unittests/org/webrtc/JavaVideoSourceTestHelper.java", "native_unittests/org/webrtc/PeerConnectionFactoryInitializationHelper.java", ] - jni_package = "" namespace = "webrtc::jni" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } diff --git a/sdk/android/native_api/jni/class_loader.cc b/sdk/android/native_api/jni/class_loader.cc index 2c06460f9e..d0aa395a1e 100644 --- a/sdk/android/native_api/jni/class_loader.cc +++ b/sdk/android/native_api/jni/class_loader.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/checks.h" -#include "sdk/android/generated_native_api_jni/jni/WebRtcClassLoader_jni.h" +#include "sdk/android/generated_native_api_jni/WebRtcClassLoader_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/native_api/jni/scoped_java_ref.h" diff --git a/sdk/android/native_api/jni/java_types.cc b/sdk/android/native_api/jni/java_types.cc index d726b49550..a97c81f1f2 100644 --- a/sdk/android/native_api/jni/java_types.cc +++ b/sdk/android/native_api/jni/java_types.cc @@ -13,17 +13,17 @@ #include #include -#include "sdk/android/generated_external_classes_jni/jni/ArrayList_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Boolean_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Double_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Enum_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Integer_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Iterable_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Iterator_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/LinkedHashMap_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Long_jni.h" -#include "sdk/android/generated_external_classes_jni/jni/Map_jni.h" -#include "sdk/android/generated_native_api_jni/jni/JniHelper_jni.h" +#include "sdk/android/generated_external_classes_jni/ArrayList_jni.h" +#include "sdk/android/generated_external_classes_jni/Boolean_jni.h" +#include "sdk/android/generated_external_classes_jni/Double_jni.h" +#include "sdk/android/generated_external_classes_jni/Enum_jni.h" +#include "sdk/android/generated_external_classes_jni/Integer_jni.h" +#include "sdk/android/generated_external_classes_jni/Iterable_jni.h" +#include "sdk/android/generated_external_classes_jni/Iterator_jni.h" +#include "sdk/android/generated_external_classes_jni/LinkedHashMap_jni.h" +#include "sdk/android/generated_external_classes_jni/Long_jni.h" +#include "sdk/android/generated_external_classes_jni/Map_jni.h" +#include "sdk/android/generated_native_api_jni/JniHelper_jni.h" namespace webrtc { diff --git a/sdk/android/native_unittests/application_context_provider.cc b/sdk/android/native_unittests/application_context_provider.cc index 885856ea7f..07b3c04faf 100644 --- a/sdk/android/native_unittests/application_context_provider.cc +++ b/sdk/android/native_unittests/application_context_provider.cc @@ -9,7 +9,7 @@ */ #include "sdk/android/native_unittests/application_context_provider.h" -#include "sdk/android/generated_native_unittests_jni/jni/ApplicationContextProvider_jni.h" +#include "sdk/android/generated_native_unittests_jni/ApplicationContextProvider_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc index fac1f7a5c4..c1353d2d79 100644 --- a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc +++ b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc @@ -19,7 +19,7 @@ #include "rtc_base/event.h" #include "rtc_base/format_macros.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_native_unittests_jni/jni/BuildInfo_jni.h" +#include "sdk/android/generated_native_unittests_jni/BuildInfo_jni.h" #include "sdk/android/native_api/audio_device_module/audio_device_android.h" #include "sdk/android/native_unittests/application_context_provider.h" #include "sdk/android/src/jni/audio_device/audio_common.h" diff --git a/sdk/android/native_unittests/codecs/wrapper_unittest.cc b/sdk/android/native_unittests/codecs/wrapper_unittest.cc index 53efd224b0..d9f268d9a3 100644 --- a/sdk/android/native_unittests/codecs/wrapper_unittest.cc +++ b/sdk/android/native_unittests/codecs/wrapper_unittest.cc @@ -10,7 +10,7 @@ #include "sdk/android/native_api/codecs/wrapper.h" #include "media/base/media_constants.h" -#include "sdk/android/generated_native_unittests_jni/jni/CodecsWrapperTestHelper_jni.h" +#include "sdk/android/generated_native_unittests_jni/CodecsWrapperTestHelper_jni.h" #include "test/gtest.h" namespace webrtc { diff --git a/sdk/android/native_unittests/java_types_unittest.cc b/sdk/android/native_unittests/java_types_unittest.cc index d70c4c122a..4e7a6ed7ca 100644 --- a/sdk/android/native_unittests/java_types_unittest.cc +++ b/sdk/android/native_unittests/java_types_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "sdk/android/generated_native_unittests_jni/jni/JavaTypesTestHelper_jni.h" +#include "sdk/android/generated_native_unittests_jni/JavaTypesTestHelper_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "test/gtest.h" diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc index ed302a5b0f..199ef14d39 100644 --- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc +++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc @@ -18,7 +18,7 @@ #include "media/engine/webrtc_media_engine.h" #include "media/engine/webrtc_media_engine_defaults.h" #include "rtc_base/logging.h" -#include "sdk/android/generated_native_unittests_jni/jni/PeerConnectionFactoryInitializationHelper_jni.h" +#include "sdk/android/generated_native_unittests_jni/PeerConnectionFactoryInitializationHelper_jni.h" #include "sdk/android/native_api/audio_device_module/audio_device_android.h" #include "sdk/android/native_api/jni/jvm.h" #include "sdk/android/native_unittests/application_context_provider.h" diff --git a/sdk/android/native_unittests/video/video_source_unittest.cc b/sdk/android/native_unittests/video/video_source_unittest.cc index 17d1df9916..3c4eed1fc3 100644 --- a/sdk/android/native_unittests/video/video_source_unittest.cc +++ b/sdk/android/native_unittests/video/video_source_unittest.cc @@ -11,7 +11,7 @@ #include #include "api/video/video_sink_interface.h" -#include "sdk/android/generated_native_unittests_jni/jni/JavaVideoSourceTestHelper_jni.h" +#include "sdk/android/generated_native_unittests_jni/JavaVideoSourceTestHelper_jni.h" #include "sdk/android/native_api/video/video_source.h" #include "test/gtest.h" diff --git a/sdk/android/src/jni/android_histogram.cc b/sdk/android/src/jni/android_histogram.cc index 75355e1e16..498f143743 100644 --- a/sdk/android/src/jni/android_histogram.cc +++ b/sdk/android/src/jni/android_histogram.cc @@ -11,7 +11,7 @@ #include #include -#include "sdk/android/generated_base_jni/jni/Histogram_jni.h" +#include "sdk/android/generated_base_jni/Histogram_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "system_wrappers/include/metrics.h" diff --git a/sdk/android/src/jni/android_media_decoder.cc b/sdk/android/src/jni/android_media_decoder.cc index 60250d84be..8e2e25fa86 100644 --- a/sdk/android/src/jni/android_media_decoder.cc +++ b/sdk/android/src/jni/android_media_decoder.cc @@ -26,7 +26,7 @@ #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/thread.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_video_jni/jni/MediaCodecVideoDecoder_jni.h" +#include "sdk/android/generated_video_jni/MediaCodecVideoDecoder_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/android_media_codec_common.h" #include "sdk/android/src/jni/video_frame.h" diff --git a/sdk/android/src/jni/android_media_encoder.cc b/sdk/android/src/jni/android_media_encoder.cc index 94496adc43..a035708cdb 100644 --- a/sdk/android/src/jni/android_media_encoder.cc +++ b/sdk/android/src/jni/android_media_encoder.cc @@ -36,7 +36,7 @@ #include "rtc_base/thread.h" #include "rtc_base/time_utils.h" #include "rtc_base/weak_ptr.h" -#include "sdk/android/generated_video_jni/jni/MediaCodecVideoEncoder_jni.h" +#include "sdk/android/generated_video_jni/MediaCodecVideoEncoder_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/android_media_codec_common.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/android_metrics.cc b/sdk/android/src/jni/android_metrics.cc index 6907b208de..2c998d4407 100644 --- a/sdk/android/src/jni/android_metrics.cc +++ b/sdk/android/src/jni/android_metrics.cc @@ -11,7 +11,7 @@ #include #include -#include "sdk/android/generated_metrics_jni/jni/Metrics_jni.h" +#include "sdk/android/generated_metrics_jni/Metrics_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "system_wrappers/include/metrics.h" diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc index 4b3256c6ae..3e124be771 100644 --- a/sdk/android/src/jni/android_network_monitor.cc +++ b/sdk/android/src/jni/android_network_monitor.cc @@ -21,8 +21,8 @@ #include "rtc_base/ip_address.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "sdk/android/generated_base_jni/jni/NetworkMonitorAutoDetect_jni.h" -#include "sdk/android/generated_base_jni/jni/NetworkMonitor_jni.h" +#include "sdk/android/generated_base_jni/NetworkMonitorAutoDetect_jni.h" +#include "sdk/android/generated_base_jni/NetworkMonitor_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/android_video_track_source.cc b/sdk/android/src/jni/android_video_track_source.cc index 973167a1ec..c6c884975c 100644 --- a/sdk/android/src/jni/android_video_track_source.cc +++ b/sdk/android/src/jni/android_video_track_source.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/android_video_track_source.h" -#include "sdk/android/generated_video_jni/jni/NativeAndroidVideoTrackSource_jni.h" +#include "sdk/android/generated_video_jni/NativeAndroidVideoTrackSource_jni.h" #include diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc index c0803ffbe7..c48fa51998 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.cc +++ b/sdk/android/src/jni/audio_device/audio_device_module.cc @@ -19,7 +19,7 @@ #include "rtc_base/logging.h" #include "rtc_base/ref_counted_object.h" #include "rtc_base/thread_checker.h" -#include "sdk/android/generated_audio_device_module_base_jni/jni/WebRtcAudioManager_jni.h" +#include "sdk/android/generated_audio_device_module_base_jni/WebRtcAudioManager_jni.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/sdk/android/src/jni/audio_device/audio_record_jni.cc b/sdk/android/src/jni/audio_device/audio_record_jni.cc index b27377edf6..74f5d7cc0d 100644 --- a/sdk/android/src/jni/audio_device/audio_record_jni.cc +++ b/sdk/android/src/jni/audio_device/audio_record_jni.cc @@ -19,7 +19,7 @@ #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_java_audio_device_module_native_jni/jni/WebRtcAudioRecord_jni.h" +#include "sdk/android/generated_java_audio_device_module_native_jni/WebRtcAudioRecord_jni.h" #include "sdk/android/src/jni/audio_device/audio_common.h" #include "sdk/android/src/jni/jni_helpers.h" #include "system_wrappers/include/metrics.h" diff --git a/sdk/android/src/jni/audio_device/audio_track_jni.cc b/sdk/android/src/jni/audio_device/audio_track_jni.cc index 70acb5b260..3c25183100 100644 --- a/sdk/android/src/jni/audio_device/audio_track_jni.cc +++ b/sdk/android/src/jni/audio_device/audio_track_jni.cc @@ -17,7 +17,7 @@ #include "rtc_base/format_macros.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" -#include "sdk/android/generated_java_audio_device_module_native_jni/jni/WebRtcAudioTrack_jni.h" +#include "sdk/android/generated_java_audio_device_module_native_jni/WebRtcAudioTrack_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/src/jni/audio_device/java_audio_device_module.cc b/sdk/android/src/jni/audio_device/java_audio_device_module.cc index 148340f561..18d0891e03 100644 --- a/sdk/android/src/jni/audio_device/java_audio_device_module.cc +++ b/sdk/android/src/jni/audio_device/java_audio_device_module.cc @@ -9,7 +9,7 @@ */ #include "absl/memory/memory.h" -#include "sdk/android/generated_java_audio_jni/jni/JavaAudioDeviceModule_jni.h" +#include "sdk/android/generated_java_audio_jni/JavaAudioDeviceModule_jni.h" #include "sdk/android/src/jni/audio_device/audio_record_jni.h" #include "sdk/android/src/jni/audio_device/audio_track_jni.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc b/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc index f0db45c733..d445cc754e 100644 --- a/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc +++ b/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "sdk/android/generated_builtin_audio_codecs_jni/jni/BuiltinAudioDecoderFactoryFactory_jni.h" +#include "sdk/android/generated_builtin_audio_codecs_jni/BuiltinAudioDecoderFactoryFactory_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc b/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc index b3a98095d7..e5a4b10eee 100644 --- a/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc +++ b/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "sdk/android/generated_builtin_audio_codecs_jni/jni/BuiltinAudioEncoderFactoryFactory_jni.h" +#include "sdk/android/generated_builtin_audio_codecs_jni/BuiltinAudioEncoderFactoryFactory_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/encoded_image.cc b/sdk/android/src/jni/encoded_image.cc index 328aa7c256..12dc5fe966 100644 --- a/sdk/android/src/jni/encoded_image.cc +++ b/sdk/android/src/jni/encoded_image.cc @@ -12,7 +12,7 @@ #include "api/video/encoded_image.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_video_jni/jni/EncodedImage_jni.h" +#include "sdk/android/generated_video_jni/EncodedImage_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/h264_utils.cc b/sdk/android/src/jni/h264_utils.cc index c067abdff9..02e3ae110d 100644 --- a/sdk/android/src/jni/h264_utils.cc +++ b/sdk/android/src/jni/h264_utils.cc @@ -11,7 +11,7 @@ #include "sdk/android/src/jni/video_codec_info.h" #include "common_video/h264/profile_level_id.h" -#include "sdk/android/generated_video_jni/jni/H264Utils_jni.h" +#include "sdk/android/generated_video_jni/H264Utils_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/java_i420_buffer.cc b/sdk/android/src/jni/java_i420_buffer.cc index 9095f7684c..95dcd66bb5 100644 --- a/sdk/android/src/jni/java_i420_buffer.cc +++ b/sdk/android/src/jni/java_i420_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "sdk/android/generated_video_jni/jni/JavaI420Buffer_jni.h" +#include "sdk/android/generated_video_jni/JavaI420Buffer_jni.h" #include "third_party/libyuv/include/libyuv/scale.h" namespace webrtc { diff --git a/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc index 915a9351a4..3764f8deeb 100644 --- a/sdk/android/src/jni/jni_common.cc +++ b/sdk/android/src/jni/jni_common.cc @@ -9,7 +9,7 @@ */ #include "rtc_base/ref_count.h" -#include "sdk/android/generated_base_jni/jni/JniCommon_jni.h" +#include "sdk/android/generated_base_jni/JniCommon_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/src/jni/logging/log_sink.cc b/sdk/android/src/jni/logging/log_sink.cc index eebe668a37..412a7815ad 100644 --- a/sdk/android/src/jni/logging/log_sink.cc +++ b/sdk/android/src/jni/logging/log_sink.cc @@ -9,7 +9,7 @@ */ #include "sdk/android/src/jni/logging/log_sink.h" -#include "sdk/android/generated_logging_jni/jni/JNILogging_jni.h" +#include "sdk/android/generated_logging_jni/JNILogging_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/native_capturer_observer.cc b/sdk/android/src/jni/native_capturer_observer.cc index 1babf68eaa..f8eb48422b 100644 --- a/sdk/android/src/jni/native_capturer_observer.cc +++ b/sdk/android/src/jni/native_capturer_observer.cc @@ -11,7 +11,7 @@ #include "sdk/android/src/jni/native_capturer_observer.h" #include "rtc_base/logging.h" -#include "sdk/android/generated_video_jni/jni/NativeCapturerObserver_jni.h" +#include "sdk/android/generated_video_jni/NativeCapturerObserver_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/android_video_track_source.h" diff --git a/sdk/android/src/jni/nv12_buffer.cc b/sdk/android/src/jni/nv12_buffer.cc index 701897fe51..d0e7972446 100644 --- a/sdk/android/src/jni/nv12_buffer.cc +++ b/sdk/android/src/jni/nv12_buffer.cc @@ -15,7 +15,7 @@ #include "third_party/libyuv/include/libyuv/scale.h" #include "rtc_base/checks.h" -#include "sdk/android/generated_video_jni/jni/NV12Buffer_jni.h" +#include "sdk/android/generated_video_jni/NV12Buffer_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/nv21_buffer.cc b/sdk/android/src/jni/nv21_buffer.cc index eddf02ddcc..10e3316f33 100644 --- a/sdk/android/src/jni/nv21_buffer.cc +++ b/sdk/android/src/jni/nv21_buffer.cc @@ -16,7 +16,7 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_base/checks.h" -#include "sdk/android/generated_video_jni/jni/NV21Buffer_jni.h" +#include "sdk/android/generated_video_jni/NV21Buffer_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/audio_track.cc b/sdk/android/src/jni/pc/audio_track.cc index 355df39cd3..b00287eaae 100644 --- a/sdk/android/src/jni/pc/audio_track.cc +++ b/sdk/android/src/jni/pc/audio_track.cc @@ -9,7 +9,7 @@ */ #include "api/media_stream_interface.h" -#include "sdk/android/generated_peerconnection_jni/jni/AudioTrack_jni.h" +#include "sdk/android/generated_peerconnection_jni/AudioTrack_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc index bc65c3a594..b937a0d03a 100644 --- a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc +++ b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc @@ -9,7 +9,7 @@ */ #include "rtc_base/log_sinks.h" -#include "sdk/android/generated_peerconnection_jni/jni/CallSessionFileRotatingLogSink_jni.h" +#include "sdk/android/generated_peerconnection_jni/CallSessionFileRotatingLogSink_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/crypto_options.cc b/sdk/android/src/jni/pc/crypto_options.cc index a592df8255..af5f195d98 100644 --- a/sdk/android/src/jni/pc/crypto_options.cc +++ b/sdk/android/src/jni/pc/crypto_options.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/pc/crypto_options.h" -#include "sdk/android/generated_peerconnection_jni/jni/CryptoOptions_jni.h" +#include "sdk/android/generated_peerconnection_jni/CryptoOptions_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/data_channel.cc b/sdk/android/src/jni/pc/data_channel.cc index bd3b1712fa..64410aafdf 100644 --- a/sdk/android/src/jni/pc/data_channel.cc +++ b/sdk/android/src/jni/pc/data_channel.cc @@ -15,7 +15,7 @@ #include "absl/memory/memory.h" #include "api/data_channel_interface.h" #include "rtc_base/logging.h" -#include "sdk/android/generated_peerconnection_jni/jni/DataChannel_jni.h" +#include "sdk/android/generated_peerconnection_jni/DataChannel_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/pc/data_channel.h" diff --git a/sdk/android/src/jni/pc/dtmf_sender.cc b/sdk/android/src/jni/pc/dtmf_sender.cc index a9c1995334..13cb027f6d 100644 --- a/sdk/android/src/jni/pc/dtmf_sender.cc +++ b/sdk/android/src/jni/pc/dtmf_sender.cc @@ -9,7 +9,7 @@ */ #include "api/dtmf_sender_interface.h" -#include "sdk/android/generated_peerconnection_jni/jni/DtmfSender_jni.h" +#include "sdk/android/generated_peerconnection_jni/DtmfSender_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/ice_candidate.cc b/sdk/android/src/jni/pc/ice_candidate.cc index ee4a4cd807..8dba39aa09 100644 --- a/sdk/android/src/jni/pc/ice_candidate.cc +++ b/sdk/android/src/jni/pc/ice_candidate.cc @@ -13,7 +13,7 @@ #include #include "pc/webrtc_sdp.h" -#include "sdk/android/generated_peerconnection_jni/jni/IceCandidate_jni.h" +#include "sdk/android/generated_peerconnection_jni/IceCandidate_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/pc/media_stream_track.h" diff --git a/sdk/android/src/jni/pc/media_constraints.cc b/sdk/android/src/jni/pc/media_constraints.cc index ed51266d35..5b52fb1b21 100644 --- a/sdk/android/src/jni/pc/media_constraints.cc +++ b/sdk/android/src/jni/pc/media_constraints.cc @@ -11,7 +11,7 @@ #include "sdk/android/src/jni/pc/media_constraints.h" #include "absl/memory/memory.h" -#include "sdk/android/generated_peerconnection_jni/jni/MediaConstraints_jni.h" +#include "sdk/android/generated_peerconnection_jni/MediaConstraints_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/media_source.cc b/sdk/android/src/jni/pc/media_source.cc index 83cdfb7f9b..e20f28f310 100644 --- a/sdk/android/src/jni/pc/media_source.cc +++ b/sdk/android/src/jni/pc/media_source.cc @@ -9,7 +9,7 @@ */ #include "api/media_stream_interface.h" -#include "sdk/android/generated_peerconnection_jni/jni/MediaSource_jni.h" +#include "sdk/android/generated_peerconnection_jni/MediaSource_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/media_stream.cc b/sdk/android/src/jni/pc/media_stream.cc index deb4252246..6bbeaa78bb 100644 --- a/sdk/android/src/jni/pc/media_stream.cc +++ b/sdk/android/src/jni/pc/media_stream.cc @@ -11,7 +11,7 @@ #include "sdk/android/src/jni/pc/media_stream.h" #include "absl/memory/memory.h" -#include "sdk/android/generated_peerconnection_jni/jni/MediaStream_jni.h" +#include "sdk/android/generated_peerconnection_jni/MediaStream_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/media_stream_track.cc b/sdk/android/src/jni/pc/media_stream_track.cc index 19ce61026f..928f10c03a 100644 --- a/sdk/android/src/jni/pc/media_stream_track.cc +++ b/sdk/android/src/jni/pc/media_stream_track.cc @@ -11,7 +11,7 @@ #include "sdk/android/src/jni/pc/media_stream_track.h" #include "api/media_stream_interface.h" -#include "sdk/android/generated_peerconnection_jni/jni/MediaStreamTrack_jni.h" +#include "sdk/android/generated_peerconnection_jni/MediaStreamTrack_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc index 311ceaf21e..ee43b258ee 100644 --- a/sdk/android/src/jni/pc/peer_connection.cc +++ b/sdk/android/src/jni/pc/peer_connection.cc @@ -41,7 +41,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "sdk/android/generated_peerconnection_jni/jni/PeerConnection_jni.h" +#include "sdk/android/generated_peerconnection_jni/PeerConnection_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/pc/crypto_options.h" diff --git a/sdk/android/src/jni/pc/peer_connection_factory.cc b/sdk/android/src/jni/pc/peer_connection_factory.cc index 9f30fe6594..aa71fc04c1 100644 --- a/sdk/android/src/jni/pc/peer_connection_factory.cc +++ b/sdk/android/src/jni/pc/peer_connection_factory.cc @@ -32,7 +32,7 @@ #include "rtc_base/event_tracer.h" #include "rtc_base/system/thread_registry.h" #include "rtc_base/thread.h" -#include "sdk/android/generated_peerconnection_jni/jni/PeerConnectionFactory_jni.h" +#include "sdk/android/generated_peerconnection_jni/PeerConnectionFactory_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/native_api/stacktrace/stacktrace.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/rtc_certificate.cc b/sdk/android/src/jni/pc/rtc_certificate.cc index d46faaf73a..f305324ac8 100644 --- a/sdk/android/src/jni/pc/rtc_certificate.cc +++ b/sdk/android/src/jni/pc/rtc_certificate.cc @@ -14,7 +14,7 @@ #include "rtc_base/ref_count.h" #include "rtc_base/rtc_certificate.h" #include "rtc_base/rtc_certificate_generator.h" -#include "sdk/android/generated_peerconnection_jni/jni/RtcCertificatePem_jni.h" +#include "sdk/android/generated_peerconnection_jni/RtcCertificatePem_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc index 9443b5ddd4..b334bb4a72 100644 --- a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc +++ b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc @@ -14,10 +14,10 @@ #include #include "rtc_base/string_encode.h" -#include "sdk/android/generated_external_classes_jni/jni/BigInteger_jni.h" -#include "sdk/android/generated_peerconnection_jni/jni/RTCStatsCollectorCallback_jni.h" -#include "sdk/android/generated_peerconnection_jni/jni/RTCStatsReport_jni.h" -#include "sdk/android/generated_peerconnection_jni/jni/RTCStats_jni.h" +#include "sdk/android/generated_external_classes_jni/BigInteger_jni.h" +#include "sdk/android/generated_peerconnection_jni/RTCStatsCollectorCallback_jni.h" +#include "sdk/android/generated_peerconnection_jni/RTCStatsReport_jni.h" +#include "sdk/android/generated_peerconnection_jni/RTCStats_jni.h" #include "sdk/android/native_api/jni/java_types.h" namespace webrtc { diff --git a/sdk/android/src/jni/pc/rtp_parameters.cc b/sdk/android/src/jni/pc/rtp_parameters.cc index 44a3d1a8b1..c6dc870180 100644 --- a/sdk/android/src/jni/pc/rtp_parameters.cc +++ b/sdk/android/src/jni/pc/rtp_parameters.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/pc/rtp_parameters.h" -#include "sdk/android/generated_peerconnection_jni/jni/RtpParameters_jni.h" +#include "sdk/android/generated_peerconnection_jni/RtpParameters_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/pc/media_stream_track.h" diff --git a/sdk/android/src/jni/pc/rtp_receiver.cc b/sdk/android/src/jni/pc/rtp_receiver.cc index bc82ca8762..15abe8db7b 100644 --- a/sdk/android/src/jni/pc/rtp_receiver.cc +++ b/sdk/android/src/jni/pc/rtp_receiver.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/pc/rtp_receiver.h" -#include "sdk/android/generated_peerconnection_jni/jni/RtpReceiver_jni.h" +#include "sdk/android/generated_peerconnection_jni/RtpReceiver_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/pc/media_stream_track.h" diff --git a/sdk/android/src/jni/pc/rtp_sender.cc b/sdk/android/src/jni/pc/rtp_sender.cc index 42edb01013..e3ef185bd1 100644 --- a/sdk/android/src/jni/pc/rtp_sender.cc +++ b/sdk/android/src/jni/pc/rtp_sender.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/pc/rtp_sender.h" -#include "sdk/android/generated_peerconnection_jni/jni/RtpSender_jni.h" +#include "sdk/android/generated_peerconnection_jni/RtpSender_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/pc/rtp_parameters.h" diff --git a/sdk/android/src/jni/pc/rtp_transceiver.cc b/sdk/android/src/jni/pc/rtp_transceiver.cc index 52fcdadb84..7d8cfdef49 100644 --- a/sdk/android/src/jni/pc/rtp_transceiver.cc +++ b/sdk/android/src/jni/pc/rtp_transceiver.cc @@ -12,7 +12,7 @@ #include -#include "sdk/android/generated_peerconnection_jni/jni/RtpTransceiver_jni.h" +#include "sdk/android/generated_peerconnection_jni/RtpTransceiver_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/pc/media_stream_track.h" diff --git a/sdk/android/src/jni/pc/sdp_observer.cc b/sdk/android/src/jni/pc/sdp_observer.cc index 78d345ae9a..fc59d1749a 100644 --- a/sdk/android/src/jni/pc/sdp_observer.cc +++ b/sdk/android/src/jni/pc/sdp_observer.cc @@ -12,7 +12,7 @@ #include -#include "sdk/android/generated_peerconnection_jni/jni/SdpObserver_jni.h" +#include "sdk/android/generated_peerconnection_jni/SdpObserver_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/media_constraints.h" diff --git a/sdk/android/src/jni/pc/session_description.cc b/sdk/android/src/jni/pc/session_description.cc index aa648fe0dc..1b335215dc 100644 --- a/sdk/android/src/jni/pc/session_description.cc +++ b/sdk/android/src/jni/pc/session_description.cc @@ -13,7 +13,7 @@ #include #include "rtc_base/logging.h" -#include "sdk/android/generated_peerconnection_jni/jni/SessionDescription_jni.h" +#include "sdk/android/generated_peerconnection_jni/SessionDescription_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc index 0f21fd30de..74ef3b8049 100644 --- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc +++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc @@ -9,7 +9,7 @@ */ #include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h" -#include "sdk/android/generated_peerconnection_jni/jni/SSLCertificateVerifier_jni.h" +#include "sdk/android/generated_peerconnection_jni/SSLCertificateVerifier_jni.h" #include "sdk/android/native_api/jni/class_loader.h" #include "sdk/android/native_api/jni/java_types.h" diff --git a/sdk/android/src/jni/pc/stats_observer.cc b/sdk/android/src/jni/pc/stats_observer.cc index c7534ec23f..6d4a31df1c 100644 --- a/sdk/android/src/jni/pc/stats_observer.cc +++ b/sdk/android/src/jni/pc/stats_observer.cc @@ -12,8 +12,8 @@ #include -#include "sdk/android/generated_peerconnection_jni/jni/StatsObserver_jni.h" -#include "sdk/android/generated_peerconnection_jni/jni/StatsReport_jni.h" +#include "sdk/android/generated_peerconnection_jni/StatsObserver_jni.h" +#include "sdk/android/generated_peerconnection_jni/StatsReport_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/pc/turn_customizer.cc b/sdk/android/src/jni/pc/turn_customizer.cc index e756313ea8..5c93fcd7c0 100644 --- a/sdk/android/src/jni/pc/turn_customizer.cc +++ b/sdk/android/src/jni/pc/turn_customizer.cc @@ -9,7 +9,7 @@ */ #include "api/turn_customizer.h" -#include "sdk/android/generated_peerconnection_jni/jni/TurnCustomizer_jni.h" +#include "sdk/android/generated_peerconnection_jni/TurnCustomizer_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/timestamp_aligner.cc b/sdk/android/src/jni/timestamp_aligner.cc index 942da435b0..c0c5fd9d9f 100644 --- a/sdk/android/src/jni/timestamp_aligner.cc +++ b/sdk/android/src/jni/timestamp_aligner.cc @@ -12,7 +12,7 @@ #include "rtc_base/time_utils.h" #include "rtc_base/timestamp_aligner.h" -#include "sdk/android/generated_video_jni/jni/TimestampAligner_jni.h" +#include "sdk/android/generated_video_jni/TimestampAligner_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/src/jni/video_codec_info.cc b/sdk/android/src/jni/video_codec_info.cc index 58b911381d..a218a1d23f 100644 --- a/sdk/android/src/jni/video_codec_info.cc +++ b/sdk/android/src/jni/video_codec_info.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/video_codec_info.h" -#include "sdk/android/generated_video_jni/jni/VideoCodecInfo_jni.h" +#include "sdk/android/generated_video_jni/VideoCodecInfo_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/jni_helpers.h" diff --git a/sdk/android/src/jni/video_codec_status.cc b/sdk/android/src/jni/video_codec_status.cc index f8613c56f6..e34d6d69e2 100644 --- a/sdk/android/src/jni/video_codec_status.cc +++ b/sdk/android/src/jni/video_codec_status.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/video_codec_status.h" -#include "sdk/android/generated_video_jni/jni/VideoCodecStatus_jni.h" +#include "sdk/android/generated_video_jni/VideoCodecStatus_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/video_decoder_factory_wrapper.cc b/sdk/android/src/jni/video_decoder_factory_wrapper.cc index 980fbb3691..2d9240493a 100644 --- a/sdk/android/src/jni/video_decoder_factory_wrapper.cc +++ b/sdk/android/src/jni/video_decoder_factory_wrapper.cc @@ -13,7 +13,7 @@ #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_decoder.h" #include "rtc_base/logging.h" -#include "sdk/android/generated_video_jni/jni/VideoDecoderFactory_jni.h" +#include "sdk/android/generated_video_jni/VideoDecoderFactory_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/video_codec_info.h" #include "sdk/android/src/jni/video_decoder_wrapper.h" diff --git a/sdk/android/src/jni/video_decoder_fallback.cc b/sdk/android/src/jni/video_decoder_fallback.cc index fb67ccbbef..a678280f69 100644 --- a/sdk/android/src/jni/video_decoder_fallback.cc +++ b/sdk/android/src/jni/video_decoder_fallback.cc @@ -11,7 +11,7 @@ #include #include "api/video_codecs/video_decoder_software_fallback_wrapper.h" -#include "sdk/android/generated_video_jni/jni/VideoDecoderFallback_jni.h" +#include "sdk/android/generated_video_jni/VideoDecoderFallback_jni.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/video_decoder_wrapper.h" diff --git a/sdk/android/src/jni/video_decoder_wrapper.cc b/sdk/android/src/jni/video_decoder_wrapper.cc index 1a157155a7..762b7394b5 100644 --- a/sdk/android/src/jni/video_decoder_wrapper.cc +++ b/sdk/android/src/jni/video_decoder_wrapper.cc @@ -17,8 +17,8 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_video_jni/jni/VideoDecoderWrapper_jni.h" -#include "sdk/android/generated_video_jni/jni/VideoDecoder_jni.h" +#include "sdk/android/generated_video_jni/VideoDecoderWrapper_jni.h" +#include "sdk/android/generated_video_jni/VideoDecoder_jni.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/encoded_image.h" #include "sdk/android/src/jni/video_codec_status.h" diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.cc b/sdk/android/src/jni/video_encoder_factory_wrapper.cc index e1011412e6..6aace5fea8 100644 --- a/sdk/android/src/jni/video_encoder_factory_wrapper.cc +++ b/sdk/android/src/jni/video_encoder_factory_wrapper.cc @@ -12,7 +12,7 @@ #include "api/video_codecs/video_encoder.h" #include "rtc_base/logging.h" -#include "sdk/android/generated_video_jni/jni/VideoEncoderFactory_jni.h" +#include "sdk/android/generated_video_jni/VideoEncoderFactory_jni.h" #include "sdk/android/native_api/jni/class_loader.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/video_codec_info.h" diff --git a/sdk/android/src/jni/video_encoder_fallback.cc b/sdk/android/src/jni/video_encoder_fallback.cc index af9863c846..d581572abf 100644 --- a/sdk/android/src/jni/video_encoder_fallback.cc +++ b/sdk/android/src/jni/video_encoder_fallback.cc @@ -11,7 +11,7 @@ #include #include "api/video_codecs/video_encoder_software_fallback_wrapper.h" -#include "sdk/android/generated_video_jni/jni/VideoEncoderFallback_jni.h" +#include "sdk/android/generated_video_jni/VideoEncoderFallback_jni.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/video_encoder_wrapper.h" diff --git a/sdk/android/src/jni/video_encoder_wrapper.cc b/sdk/android/src/jni/video_encoder_wrapper.cc index ebf6aadf90..4f4cce728f 100644 --- a/sdk/android/src/jni/video_encoder_wrapper.cc +++ b/sdk/android/src/jni/video_encoder_wrapper.cc @@ -20,8 +20,8 @@ #include "rtc_base/logging.h" #include "rtc_base/task_utils/to_queued_task.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_video_jni/jni/VideoEncoderWrapper_jni.h" -#include "sdk/android/generated_video_jni/jni/VideoEncoder_jni.h" +#include "sdk/android/generated_video_jni/VideoEncoderWrapper_jni.h" +#include "sdk/android/generated_video_jni/VideoEncoder_jni.h" #include "sdk/android/native_api/jni/class_loader.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/src/jni/encoded_image.h" diff --git a/sdk/android/src/jni/video_frame.cc b/sdk/android/src/jni/video_frame.cc index 0d025272e9..d57fe8f9b7 100644 --- a/sdk/android/src/jni/video_frame.cc +++ b/sdk/android/src/jni/video_frame.cc @@ -19,7 +19,7 @@ #include "rtc_base/keep_ref_until_done.h" #include "rtc_base/logging.h" #include "rtc_base/time_utils.h" -#include "sdk/android/generated_video_jni/jni/VideoFrame_jni.h" +#include "sdk/android/generated_video_jni/VideoFrame_jni.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/wrapped_native_i420_buffer.h" diff --git a/sdk/android/src/jni/video_sink.cc b/sdk/android/src/jni/video_sink.cc index 6ffba9c158..14321084d0 100644 --- a/sdk/android/src/jni/video_sink.cc +++ b/sdk/android/src/jni/video_sink.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/video_sink.h" -#include "sdk/android/generated_video_jni/jni/VideoSink_jni.h" +#include "sdk/android/generated_video_jni/VideoSink_jni.h" #include "sdk/android/src/jni/video_frame.h" namespace webrtc { diff --git a/sdk/android/src/jni/video_track.cc b/sdk/android/src/jni/video_track.cc index b3b1278cdb..70bedc12cf 100644 --- a/sdk/android/src/jni/video_track.cc +++ b/sdk/android/src/jni/video_track.cc @@ -11,7 +11,7 @@ #include #include "api/media_stream_interface.h" -#include "sdk/android/generated_video_jni/jni/VideoTrack_jni.h" +#include "sdk/android/generated_video_jni/VideoTrack_jni.h" #include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/video_sink.h" diff --git a/sdk/android/src/jni/vp8_codec.cc b/sdk/android/src/jni/vp8_codec.cc index bbc6024b8e..32a5a62a8d 100644 --- a/sdk/android/src/jni/vp8_codec.cc +++ b/sdk/android/src/jni/vp8_codec.cc @@ -11,8 +11,8 @@ #include #include "modules/video_coding/codecs/vp8/include/vp8.h" -#include "sdk/android/generated_libvpx_vp8_jni/jni/LibvpxVp8Decoder_jni.h" -#include "sdk/android/generated_libvpx_vp8_jni/jni/LibvpxVp8Encoder_jni.h" +#include "sdk/android/generated_libvpx_vp8_jni/LibvpxVp8Decoder_jni.h" +#include "sdk/android/generated_libvpx_vp8_jni/LibvpxVp8Encoder_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/src/jni/vp9_codec.cc b/sdk/android/src/jni/vp9_codec.cc index 37e87b1d3c..ad9ca793ce 100644 --- a/sdk/android/src/jni/vp9_codec.cc +++ b/sdk/android/src/jni/vp9_codec.cc @@ -11,8 +11,8 @@ #include #include "modules/video_coding/codecs/vp9/include/vp9.h" -#include "sdk/android/generated_libvpx_vp9_jni/jni/LibvpxVp9Decoder_jni.h" -#include "sdk/android/generated_libvpx_vp9_jni/jni/LibvpxVp9Encoder_jni.h" +#include "sdk/android/generated_libvpx_vp9_jni/LibvpxVp9Decoder_jni.h" +#include "sdk/android/generated_libvpx_vp9_jni/LibvpxVp9Encoder_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/src/jni/wrapped_native_i420_buffer.cc b/sdk/android/src/jni/wrapped_native_i420_buffer.cc index eab2840553..f2c543e8c2 100644 --- a/sdk/android/src/jni/wrapped_native_i420_buffer.cc +++ b/sdk/android/src/jni/wrapped_native_i420_buffer.cc @@ -10,7 +10,7 @@ #include "sdk/android/src/jni/wrapped_native_i420_buffer.h" -#include "sdk/android/generated_video_jni/jni/WrappedNativeI420Buffer_jni.h" +#include "sdk/android/generated_video_jni/WrappedNativeI420Buffer_jni.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/android/src/jni/yuv_helper.cc b/sdk/android/src/jni/yuv_helper.cc index 11acfffe83..04ae49b2c9 100644 --- a/sdk/android/src/jni/yuv_helper.cc +++ b/sdk/android/src/jni/yuv_helper.cc @@ -10,7 +10,7 @@ #include -#include "sdk/android/generated_video_jni/jni/YuvHelper_jni.h" +#include "sdk/android/generated_video_jni/YuvHelper_jni.h" #include "sdk/android/src/jni/jni_helpers.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/planar_functions.h"