| OLD | NEW |
| 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/utility/include/jvm_android.h" |
| 16 | 16 |
| 17 #include "webrtc/base/checks.h" | 17 #include "webrtc/rtc_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; |
| 26 | 26 |
| 27 // TODO(henrika): add more clases here if needed. | 27 // TODO(henrika): add more clases here if needed. |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni)); | 275 return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni)); |
| 276 } | 276 } |
| 277 | 277 |
| 278 JavaClass JVM::GetClass(const char* name) { | 278 JavaClass JVM::GetClass(const char* name) { |
| 279 ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str()); | 279 ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str()); |
| 280 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 280 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 281 return JavaClass(jni(), LookUpClass(name)); | 281 return JavaClass(jni(), LookUpClass(name)); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } // namespace webrtc | 284 } // namespace webrtc |
| OLD | NEW |