diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-11 01:49:55 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-11 01:49:55 +0000 |
| commit | 5ecf7cb2894d80ad8dea0cc608b526929a15de2f (patch) | |
| tree | dd5080e05c8486263906848f705b86269da9f106 /components/cronet | |
| parent | b1a64b4db3cc5b4c6066ebcfbe44238b584782ce (diff) | |
| download | chromium_src-5ecf7cb2894d80ad8dea0cc608b526929a15de2f.zip chromium_src-5ecf7cb2894d80ad8dea0cc608b526929a15de2f.tar.gz chromium_src-5ecf7cb2894d80ad8dea0cc608b526929a15de2f.tar.bz2 | |
Make it possible to build cronet without icu.
BUG=362608
Review URL: https://codereview.chromium.org/274183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/cronet')
| -rw-r--r-- | components/cronet/android/cronet_jni.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/components/cronet/android/cronet_jni.cc b/components/cronet/android/cronet_jni.cc index 6a370a3..f67425b 100644 --- a/components/cronet/android/cronet_jni.cc +++ b/components/cronet/android/cronet_jni.cc @@ -6,12 +6,15 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "base/at_exit.h" -#include "base/i18n/icu_util.h" #include "components/cronet/android/org_chromium_net_UrlRequest.h" #include "components/cronet/android/org_chromium_net_UrlRequestContext.h" #include "net/android/net_jni_registrar.h" #include "url/android/url_jni_registrar.h" +#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) +#include "base/i18n/icu_util.h" +#endif + namespace { const base::android::RegistrationMethod kCronetRegisteredMethods[] = { @@ -42,7 +45,9 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { g_at_exit_manager = new base::AtExitManager(); +#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) base::i18n::InitializeICU(); +#endif return JNI_VERSION_1_6; } |