OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/android/base_jni_registrar.h" | 5 #include "base/android/base_jni_registrar.h" |
6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
7 #include "base/android/jni_registrar.h" | 7 #include "base/android/jni_registrar.h" |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/i18n/icu_util.h" | |
10 #include "components/cronet/android/org_chromium_net_UrlRequest.h" | 9 #include "components/cronet/android/org_chromium_net_UrlRequest.h" |
11 #include "components/cronet/android/org_chromium_net_UrlRequestContext.h" | 10 #include "components/cronet/android/org_chromium_net_UrlRequestContext.h" |
12 #include "net/android/net_jni_registrar.h" | 11 #include "net/android/net_jni_registrar.h" |
13 #include "url/android/url_jni_registrar.h" | 12 #include "url/android/url_jni_registrar.h" |
14 | 13 |
| 14 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
| 15 #include "base/i18n/icu_util.h" |
| 16 #endif |
| 17 |
15 namespace { | 18 namespace { |
16 | 19 |
17 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { | 20 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { |
18 {"BaseAndroid", base::android::RegisterJni}, | 21 {"BaseAndroid", base::android::RegisterJni}, |
19 {"NetAndroid", net::android::RegisterJni}, | 22 {"NetAndroid", net::android::RegisterJni}, |
20 {"UrlAndroid", url::android::RegisterJni}, | 23 {"UrlAndroid", url::android::RegisterJni}, |
21 {"UrlRequest", cronet::UrlRequestRegisterJni}, | 24 {"UrlRequest", cronet::UrlRequestRegisterJni}, |
22 {"UrlRequestContext", cronet::UrlRequestContextRegisterJni}, | 25 {"UrlRequestContext", cronet::UrlRequestContextRegisterJni}, |
23 }; | 26 }; |
24 | 27 |
(...skipping 10 matching lines...) Expand all Loading... |
35 | 38 |
36 base::android::InitVM(vm); | 39 base::android::InitVM(vm); |
37 | 40 |
38 if (!base::android::RegisterNativeMethods( | 41 if (!base::android::RegisterNativeMethods( |
39 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) { | 42 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) { |
40 return -1; | 43 return -1; |
41 } | 44 } |
42 | 45 |
43 g_at_exit_manager = new base::AtExitManager(); | 46 g_at_exit_manager = new base::AtExitManager(); |
44 | 47 |
| 48 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
45 base::i18n::InitializeICU(); | 49 base::i18n::InitializeICU(); |
| 50 #endif |
46 | 51 |
47 return JNI_VERSION_1_6; | 52 return JNI_VERSION_1_6; |
48 } | 53 } |
49 | 54 |
50 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { | 55 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { |
51 if (g_at_exit_manager) { | 56 if (g_at_exit_manager) { |
52 delete g_at_exit_manager; | 57 delete g_at_exit_manager; |
53 g_at_exit_manager = NULL; | 58 g_at_exit_manager = NULL; |
54 } | 59 } |
55 } | 60 } |
56 | 61 |
OLD | NEW |