webrtc/modules/audio_device/android/audio_manager.h - Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/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/modules/audio_device/android/audio_manager.h

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)

Patch Set: 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/modules/audio_device/android/audio_manager.h

diff --git a/webrtc/modules/audio_device/android/audio_manager.h b/webrtc/modules/audio_device/android/audio_manager.h

index e15e4aaf7708438cec4b23b28ddb69028bfb994f..6540cc505d6a33232dc71283cd3acdc255e916b1 100644

--- a/webrtc/modules/audio_device/android/audio_manager.h

+++ b/webrtc/modules/audio_device/android/audio_manager.h

@@ -16,14 +16,14 @@

#include <jni.h>

#include <SLES/OpenSLES.h>

+#include "webrtc/base/thread_checker.h"

#include "webrtc/modules/audio_device/android/audio_common.h"

-#include "webrtc/modules/audio_device/android/opensles_common.h"

#include "webrtc/modules/audio_device/audio_device_config.h"

-#include "webrtc/modules/audio_device/audio_device_generic.h"

#include "webrtc/modules/audio_device/include/audio_device_defines.h"

+#include "webrtc/modules/audio_device/android/opensles_common.h"

+#include "webrtc/modules/audio_device/audio_device_generic.h"

#include "webrtc/modules/utility/include/helpers_android.h"

#include "webrtc/modules/utility/include/jvm_android.h"

-#include "webrtc/rtc_base/thread_checker.h"

namespace webrtc {