webrtc/api/java/jni/peerconnection_jni.cc - Issue 1610243002: Move talk/app/webrtc to webrtc/api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/java/jni/peerconnection_jni.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/api/audiotrack.h ('K') | « webrtc/api/java/jni/native_handle_impl.cc ('k') | webrtc/api/java/jni/surfacetexturehelper_jni.h » ('j') | webrtc/api/java/testcommon/src/org/webrtc/PeerConnectionTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/api/java/jni/peerconnection_jni.cc

diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc

similarity index 99%

rename from talk/app/webrtc/java/jni/peerconnection_jni.cc

rename to webrtc/api/java/jni/peerconnection_jni.cc

index 1e138f6b945962467e1735b2b50ec26582db07ac..1f88f0942d53cc7aa7fac8ec3c313ed6e423204b 100644

--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc

+++ b/webrtc/api/java/jni/peerconnection_jni.cc

@@ -59,15 +59,15 @@

#include <limits>

#include <utility>

-#include "talk/app/webrtc/java/jni/classreferenceholder.h"

-#include "talk/app/webrtc/java/jni/jni_helpers.h"

-#include "talk/app/webrtc/java/jni/native_handle_impl.h"

-#include "talk/app/webrtc/dtlsidentitystore.h"

-#include "talk/app/webrtc/mediaconstraintsinterface.h"

-#include "talk/app/webrtc/peerconnectioninterface.h"

-#include "talk/app/webrtc/rtpreceiverinterface.h"

-#include "talk/app/webrtc/rtpsenderinterface.h"

-#include "talk/app/webrtc/videosourceinterface.h"

+#include "webrtc/api/dtlsidentitystore.h"

+#include "webrtc/api/java/jni/classreferenceholder.h"

+#include "webrtc/api/java/jni/jni_helpers.h"

+#include "webrtc/api/java/jni/native_handle_impl.h"

+#include "webrtc/api/mediaconstraintsinterface.h"

+#include "webrtc/api/peerconnectioninterface.h"

+#include "webrtc/api/rtpreceiverinterface.h"

+#include "webrtc/api/rtpsenderinterface.h"

+#include "webrtc/api/videosourceinterface.h"

#include "talk/media/base/videocapturer.h"

#include "talk/media/base/videorenderer.h"

#include "talk/media/devices/videorendererfactory.h"

@@ -87,11 +87,11 @@

#include "webrtc/voice_engine/include/voe_base.h"

#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)

-#include "talk/app/webrtc/androidvideocapturer.h"

-#include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h"

-#include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h"

-#include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h"

-#include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h"

+#include "webrtc/api/androidvideocapturer.h"

+#include "webrtc/api/java/jni/androidmediadecoder_jni.h"

+#include "webrtc/api/java/jni/androidmediaencoder_jni.h"

+#include "webrtc/api/java/jni/androidnetworkmonitor_jni.h"

+#include "webrtc/api/java/jni/androidvideocapturer_jni.h"

#include "webrtc/modules/video_render/video_render_internal.h"

#include "webrtc/system_wrappers/include/logcat_trace_context.h"

using webrtc::LogcatTraceContext;