webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc - Issue 2547483003: Move /webrtc/api/android files to /webrtc/sdk/android

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/sdk/android/src/jni/androidmediadecoder_jni.cc

Issue 2547483003: Move /webrtc/api/android files to /webrtc/sdk/android (Closed)

Patch Set: Move to api folder under Android instead of src Created 4 years ago

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

Jump to:

Index: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

diff --git a/webrtc/api/android/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

similarity index 99%

rename from webrtc/api/android/jni/androidmediadecoder_jni.cc

rename to webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

index 96c0fc2f7cbae92130f69d6313d3acdf93e84f3e..c89f902a62a449703c396223a97a78872eeae29e 100644

--- a/webrtc/api/android/jni/androidmediadecoder_jni.cc

+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

@@ -14,15 +14,15 @@

// NOTICE: androidmediadecoder_jni.h must be included before

// androidmediacodeccommon.h to avoid build errors.

-#include "webrtc/api/android/jni/androidmediadecoder_jni.h"

+#include "webrtc/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/api/android/jni/androidmediacodeccommon.h"

-#include "webrtc/api/android/jni/classreferenceholder.h"

-#include "webrtc/api/android/jni/native_handle_impl.h"

-#include "webrtc/api/android/jni/surfacetexturehelper_jni.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 "webrtc/base/bind.h"

#include "webrtc/base/checks.h"

#include "webrtc/base/logging.h"