| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright 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 "webrtc/pc/test/androidtestinitializer.h" | 11 #include "webrtc/pc/test/androidtestinitializer.h" | 
| 12 | 12 | 
| 13 #include <pthread.h> | 13 #include <pthread.h> | 
| 14 | 14 | 
| 15 #include "webrtc/base/ignore_wundef.h" | 15 #include "webrtc/rtc_base/ignore_wundef.h" | 
| 16 | 16 | 
| 17 // Note: this dependency is dangerous since it reaches into Chromium's base. | 17 // Note: this dependency is dangerous since it reaches into Chromium's base. | 
| 18 // There's a risk of e.g. macro clashes. This file may only be used in tests. | 18 // There's a risk of e.g. macro clashes. This file may only be used in tests. | 
| 19 // Since we use Chromes build system for creating the gtest binary, this should | 19 // Since we use Chromes build system for creating the gtest binary, this should | 
| 20 // be fine. | 20 // be fine. | 
| 21 RTC_PUSH_IGNORING_WUNDEF() | 21 RTC_PUSH_IGNORING_WUNDEF() | 
| 22 #include "base/android/jni_android.h" | 22 #include "base/android/jni_android.h" | 
| 23 RTC_POP_IGNORING_WUNDEF() | 23 RTC_POP_IGNORING_WUNDEF() | 
| 24 | 24 | 
| 25 #include "webrtc/base/checks.h" |  | 
| 26 #include "webrtc/base/ssladapter.h" |  | 
| 27 #include "webrtc/modules/utility/include/jvm_android.h" | 25 #include "webrtc/modules/utility/include/jvm_android.h" | 
|  | 26 #include "webrtc/rtc_base/checks.h" | 
|  | 27 #include "webrtc/rtc_base/ssladapter.h" | 
| 28 | 28 | 
| 29 namespace webrtc { | 29 namespace webrtc { | 
| 30 | 30 | 
| 31 namespace { | 31 namespace { | 
| 32 | 32 | 
| 33 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; | 33 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; | 
| 34 | 34 | 
| 35 // There can only be one JNI_OnLoad in each binary. So since this is a GTEST | 35 // There can only be one JNI_OnLoad in each binary. So since this is a GTEST | 
| 36 // C++ runner binary, we want to initialize the same global objects we normally | 36 // C++ runner binary, we want to initialize the same global objects we normally | 
| 37 // do if this had been a Java binary. | 37 // do if this had been a Java binary. | 
| 38 void EnsureInitializedOnce() { | 38 void EnsureInitializedOnce() { | 
| 39   RTC_CHECK(::base::android::IsVMInitialized()); | 39   RTC_CHECK(::base::android::IsVMInitialized()); | 
| 40   JNIEnv* jni = ::base::android::AttachCurrentThread(); | 40   JNIEnv* jni = ::base::android::AttachCurrentThread(); | 
| 41   JavaVM* jvm = NULL; | 41   JavaVM* jvm = NULL; | 
| 42   RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); | 42   RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); | 
| 43 | 43 | 
| 44   RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()"; | 44   RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()"; | 
| 45 | 45 | 
| 46   webrtc::JVM::Initialize(jvm); | 46   webrtc::JVM::Initialize(jvm); | 
| 47 } | 47 } | 
| 48 | 48 | 
| 49 }  // anonymous namespace | 49 }  // anonymous namespace | 
| 50 | 50 | 
| 51 void InitializeAndroidObjects() { | 51 void InitializeAndroidObjects() { | 
| 52   RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); | 52   RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); | 
| 53 } | 53 } | 
| 54 | 54 | 
| 55 }  // namespace webrtc | 55 }  // namespace webrtc | 
| OLD | NEW | 
|---|