webrtc/sdk/android/src/jni/androidmediacodeccommon.h - Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3)

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/androidmediacodeccommon.h

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)

Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 6 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:

Index: webrtc/sdk/android/src/jni/androidmediacodeccommon.h

diff --git a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h

index 9f8e9603360cd26aef40cafa4a93cd449029bb53..fc85f7e9c5160fcda028583686956b19f28d3a7a 100644

--- a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h

+++ b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h

@@ -14,11 +14,10 @@

#include <android/log.h>

#include <string>

-#include "webrtc/base/thread.h"

+#include "webrtc/rtc_base/logging.h"

+#include "webrtc/rtc_base/thread.h"

#include "webrtc/sdk/android/src/jni/classreferenceholder.h"

#include "webrtc/sdk/android/src/jni/jni_helpers.h"

-#include "webrtc/base/logging.h"

-#include "webrtc/base/thread.h"

namespace webrtc_jni {