| Index: components/cronet/android/cronet_library_loader.cc
|
| diff --git a/components/cronet/android/cronet_library_loader.cc b/components/cronet/android/cronet_library_loader.cc
|
| index e94c7754cf7c70d1afa0b80294d12c5ae8bf1752..2c6e3b5f797d587c396efdb571069aff8344e8d6 100644
|
| --- a/components/cronet/android/cronet_library_loader.cc
|
| +++ b/components/cronet/android/cronet_library_loader.cc
|
| @@ -5,6 +5,7 @@
|
| #include "components/cronet/android/cronet_library_loader.h"
|
|
|
| #include <jni.h>
|
| +#include <vector>
|
|
|
| #include "base/android/base_jni_onload.h"
|
| #include "base/android/base_jni_registrar.h"
|
| @@ -22,6 +23,7 @@
|
| #include "components/cronet/android/cronet_upload_data_stream_adapter.h"
|
| #include "components/cronet/android/cronet_url_request_adapter.h"
|
| #include "components/cronet/android/cronet_url_request_context_adapter.h"
|
| +#include "components/cronet/android/features.h"
|
| #include "components/cronet/version.h"
|
| #include "jni/CronetLibraryLoader_jni.h"
|
| #include "net/android/net_jni_registrar.h"
|
| @@ -29,7 +31,7 @@
|
| #include "net/base/network_change_notifier.h"
|
| #include "url/url_util.h"
|
|
|
| -#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
|
| +#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
|
| #include "url/android/url_jni_registrar.h" // nogncheck
|
| #else
|
| #include "base/i18n/icu_util.h"
|
| @@ -50,7 +52,7 @@ const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
|
| {"CronetUrlRequestContextAdapter",
|
| CronetUrlRequestContextAdapterRegisterJni},
|
| {"NetAndroid", net::android::RegisterJni},
|
| -#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
|
| +#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
|
| {"UrlAndroid", url::android::RegisterJni},
|
| #endif
|
| };
|
| @@ -91,7 +93,7 @@ void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
|
| }
|
|
|
| void CronetInitOnMainThread(JNIEnv* env, const JavaParamRef<jclass>& jcaller) {
|
| -#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
|
| +#if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
|
| base::i18n::InitializeICU();
|
| #endif
|
|
|
|
|