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

Side by Side Diff: webrtc/sdk/android/src/jni/jni_onload.cc

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase Created 3 years, 3 months 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 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 <jni.h> 11 #include <jni.h>
12 #undef JNIEXPORT 12 #undef JNIEXPORT
13 #define JNIEXPORT __attribute__((visibility("default"))) 13 #define JNIEXPORT __attribute__((visibility("default")))
14 14
15 #include "webrtc/rtc_base/ssladapter.h" 15 #include "webrtc/rtc_base/ssladapter.h"
16 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 16 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
17 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 17 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
18 18
19 namespace webrtc_jni { 19 namespace webrtc {
20 namespace jni {
20 21
21 extern "C" jint JNIEXPORT JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) { 22 extern "C" jint JNIEXPORT JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
22 jint ret = InitGlobalJniVariables(jvm); 23 jint ret = InitGlobalJniVariables(jvm);
23 RTC_DCHECK_GE(ret, 0); 24 RTC_DCHECK_GE(ret, 0);
24 if (ret < 0) 25 if (ret < 0)
25 return -1; 26 return -1;
26 27
27 RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()"; 28 RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()";
28 LoadGlobalClassReferenceHolder(); 29 LoadGlobalClassReferenceHolder();
29 30
30 return ret; 31 return ret;
31 } 32 }
32 33
33 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM *jvm, void *reserved) { 34 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM *jvm, void *reserved) {
34 FreeGlobalClassReferenceHolder(); 35 FreeGlobalClassReferenceHolder();
35 RTC_CHECK(rtc::CleanupSSL()) << "Failed to CleanupSSL()"; 36 RTC_CHECK(rtc::CleanupSSL()) << "Failed to CleanupSSL()";
36 } 37 }
37 38
38 } // namespace webrtc_jni 39 } // namespace jni
40 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/jni_helpers.cc ('k') | webrtc/sdk/android/src/jni/native_handle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698