| 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 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 #ifdef WEBRTC_ANDROID | 158 #ifdef WEBRTC_ANDROID |
| 159 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), | 159 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), |
| 160 reinterpret_cast<jobject>(context)); | 160 reinterpret_cast<jobject>(context)); |
| 161 return 0; | 161 return 0; |
| 162 #else | 162 #else |
| 163 return -1; | 163 return -1; |
| 164 #endif | 164 #endif |
| 165 } | 165 } |
| 166 #endif | 166 #endif |
| 167 | 167 |
| 168 std::string VoiceEngine::GetVersionString() { |
| 169 std::string version = "VoiceEngine 4.1.0"; |
| 170 #ifdef WEBRTC_EXTERNAL_TRANSPORT |
| 171 version += " (External transport build)"; |
| 172 #endif |
| 173 return version; |
| 174 } |
| 175 |
| 168 } // namespace webrtc | 176 } // namespace webrtc |
| OLD | NEW |