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

Mass refactoring: Change JNI #includes to use full paths (webrtc/).

Browse Source 
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 <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28380}
This commit is contained in:
Eric Stevenson
2019-06-24 13:09:50 -04:00
committed by Commit Bot
parent 6e8bfaea94
commit 0d65fb5451
70 changed files with 87 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/native_unittests/application_context_provider.cc
View File

@ -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 {

2
sdk/android/native_unittests/audio_device/audio_device_unittest.cc
View File

@ -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"

2
sdk/android/native_unittests/codecs/wrapper_unittest.cc
View File

@ -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 {

2
sdk/android/native_unittests/java_types_unittest.cc
View File

@ -11,7 +11,7 @@
#include <memory>
#include <vector>
#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"

2
sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
View File

@ -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"

2
sdk/android/native_unittests/video/video_source_unittest.cc
View File

@ -11,7 +11,7 @@
#include <vector>
#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"