Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: webrtc/modules/audio_device/android/jvm_android.cc

Issue 2533573002: Move ADM specific Android files into modules/audio_device/android/ (Closed)
Patch Set: re-add dep 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:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <android/log.h> 11 #include <android/log.h>
12 12
13 #include <memory> 13 #include <memory>
14 14
15 #include "webrtc/modules/utility/include/jvm_android.h" 15 #include "webrtc/modules/audio_device/android/jvm_android.h"
16 16
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 18
19 #define TAG "JVM" 19 #define TAG "JVM"
20 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__) 20 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
21 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__) 21 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 JVM* g_jvm; 25 JVM* g_jvm;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni)); 267 return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni));
268 } 268 }
269 269
270 JavaClass JVM::GetClass(const char* name) { 270 JavaClass JVM::GetClass(const char* name) {
271 ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str()); 271 ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str());
272 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 272 RTC_DCHECK(thread_checker_.CalledOnValidThread());
273 return JavaClass(jni(), LookUpClass(name)); 273 return JavaClass(jni(), LookUpClass(name));
274 } 274 }
275 275
276 } // namespace webrtc 276 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698