| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2012 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 #if defined(WEBRTC_ANDROID) | 11 #if defined(WEBRTC_ANDROID) | 
| 12 #include "webrtc/modules/audio_device/android/audio_device_template.h" | 12 #include "webrtc/modules/audio_device/android/audio_device_template.h" | 
| 13 #include "webrtc/modules/audio_device/android/audio_record_jni.h" | 13 #include "webrtc/modules/audio_device/android/audio_record_jni.h" | 
| 14 #include "webrtc/modules/audio_device/android/audio_track_jni.h" | 14 #include "webrtc/modules/audio_device/android/audio_track_jni.h" | 
| 15 #include "webrtc/modules/utility/interface/jvm_android.h" | 15 #include "webrtc/modules/utility/include/jvm_android.h" | 
| 16 #endif | 16 #endif | 
| 17 | 17 | 
| 18 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" | 18 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" | 
| 19 #include "webrtc/system_wrappers/include/trace.h" | 19 #include "webrtc/system_wrappers/include/trace.h" | 
| 20 #include "webrtc/voice_engine/voice_engine_impl.h" | 20 #include "webrtc/voice_engine/voice_engine_impl.h" | 
| 21 | 21 | 
| 22 namespace webrtc { | 22 namespace webrtc { | 
| 23 | 23 | 
| 24 // Counter to be ensure that we can add a correct ID in all static trace | 24 // Counter to be ensure that we can add a correct ID in all static trace | 
| 25 // methods. It is not the nicest solution, especially not since we already | 25 // methods. It is not the nicest solution, especially not since we already | 
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 147   webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), | 147   webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), | 
| 148                           reinterpret_cast<jobject>(context)); | 148                           reinterpret_cast<jobject>(context)); | 
| 149   return 0; | 149   return 0; | 
| 150 #else | 150 #else | 
| 151   return -1; | 151   return -1; | 
| 152 #endif | 152 #endif | 
| 153 } | 153 } | 
| 154 #endif | 154 #endif | 
| 155 | 155 | 
| 156 }  // namespace webrtc | 156 }  // namespace webrtc | 
| OLD | NEW | 
|---|