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

Side by Side Diff: components/cronet/android/cronet_library_loader.cc

Issue 2215863002: Fix cronet build after JNI registration change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "components/cronet/android/cronet_library_loader.h" 5 #include "components/cronet/android/cronet_library_loader.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/base_jni_onload.h" 10 #include "base/android/base_jni_onload.h"
(...skipping 14 matching lines...) Expand all
25 #include "components/cronet/android/cronet_url_request_adapter.h" 25 #include "components/cronet/android/cronet_url_request_adapter.h"
26 #include "components/cronet/android/cronet_url_request_context_adapter.h" 26 #include "components/cronet/android/cronet_url_request_context_adapter.h"
27 #include "components/cronet/version.h" 27 #include "components/cronet/version.h"
28 #include "jni/CronetLibraryLoader_jni.h" 28 #include "jni/CronetLibraryLoader_jni.h"
29 #include "net/android/net_jni_registrar.h" 29 #include "net/android/net_jni_registrar.h"
30 #include "net/android/network_change_notifier_factory_android.h" 30 #include "net/android/network_change_notifier_factory_android.h"
31 #include "net/base/network_change_notifier.h" 31 #include "net/base/network_change_notifier.h"
32 #include "url/url_features.h" 32 #include "url/url_features.h"
33 #include "url/url_util.h" 33 #include "url/url_util.h"
34 34
35 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) 35 #if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
36 #include "url/android/url_jni_registrar.h" // nogncheck
37 #else
38 #include "base/i18n/icu_util.h" // nogncheck 36 #include "base/i18n/icu_util.h" // nogncheck
39 #endif 37 #endif
40 38
41 namespace cronet { 39 namespace cronet {
42 namespace { 40 namespace {
43 41
44 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { 42 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
45 {"BaseAndroid", base::android::RegisterJni}, 43 {"BaseAndroid", base::android::RegisterJni},
46 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, 44 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni},
47 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, 45 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni},
48 {"CronetBidirectionalStreamAdapter", 46 {"CronetBidirectionalStreamAdapter",
49 CronetBidirectionalStreamAdapter::RegisterJni}, 47 CronetBidirectionalStreamAdapter::RegisterJni},
50 {"CronetLibraryLoader", RegisterNativesImpl}, 48 {"CronetLibraryLoader", RegisterNativesImpl},
51 {"CronetUploadDataStreamAdapter", CronetUploadDataStreamAdapterRegisterJni}, 49 {"CronetUploadDataStreamAdapter", CronetUploadDataStreamAdapterRegisterJni},
52 {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni}, 50 {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni},
53 {"CronetUrlRequestContextAdapter", 51 {"CronetUrlRequestContextAdapter",
54 CronetUrlRequestContextAdapterRegisterJni}, 52 CronetUrlRequestContextAdapterRegisterJni},
55 {"NetAndroid", net::android::RegisterJni}, 53 {"NetAndroid", net::android::RegisterJni},
56 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
57 {"UrlAndroid", url::android::RegisterJni},
58 #endif
59 }; 54 };
60 55
61 // MessageLoop on the main thread, which is where objects that receive Java 56 // MessageLoop on the main thread, which is where objects that receive Java
62 // notifications generally live. 57 // notifications generally live.
63 base::MessageLoop* g_main_message_loop = nullptr; 58 base::MessageLoop* g_main_message_loop = nullptr;
64 59
65 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; 60 net::NetworkChangeNotifier* g_network_change_notifier = nullptr;
66 61
67 bool RegisterJNI(JNIEnv* env) { 62 bool RegisterJNI(JNIEnv* env) {
68 return base::android::RegisterNativeMethods( 63 return base::android::RegisterNativeMethods(
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 g_network_change_notifier = net::NetworkChangeNotifier::Create(); 107 g_network_change_notifier = net::NetworkChangeNotifier::Create();
113 } 108 }
114 109
115 ScopedJavaLocalRef<jstring> GetCronetVersion( 110 ScopedJavaLocalRef<jstring> GetCronetVersion(
116 JNIEnv* env, 111 JNIEnv* env,
117 const JavaParamRef<jclass>& jcaller) { 112 const JavaParamRef<jclass>& jcaller) {
118 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION); 113 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION);
119 } 114 }
120 115
121 } // namespace cronet 116 } // namespace cronet
OLDNEW
« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698