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

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: Removed processing of api.gyp for Chromium builds Created 4 years, 10 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

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 bbbd77f03c3c94b90607a689e8a299105b0cf22e..1160b2b134dd8eae80ca8ef93438cbff0f218074 100644

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

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

@@ -59,20 +59,20 @@

#include <limits>

#include <utility>

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

-#include "talk/app/webrtc/dtlsidentitystore.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 "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/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/androidvideocapturer.h"

+#include "webrtc/api/dtlsidentitystore.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/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 "webrtc/base/bind.h"

#include "webrtc/base/checks.h"

#include "webrtc/base/event_tracer.h"

@@ -87,6 +87,7 @@

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

#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"

#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"

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

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

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

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

« no previous file with comments | « webrtc/api/java/jni/native_handle_impl.cc ('k') | webrtc/api/java/jni/surfacetexturehelper_jni.h » ('j') | no next file with comments »