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

Unified Diff: net/android/net_jni_registrar.cc

Issue 274183002: Make it possible to build cronet without icu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops...add back file Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/android/cronet_jni.cc ('k') | net/base/net_util_icu_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/net_jni_registrar.cc
diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc
index ebc7276206d9b5c9bf3e04898afa917651cabc6f..bdebf0e0f919a85fbccb75e7b6e7a4bc8de83167 100644
--- a/net/android/net_jni_registrar.cc
+++ b/net/android/net_jni_registrar.cc
@@ -15,7 +15,7 @@
#include "net/cert/x509_util_android.h"
#include "net/proxy/proxy_config_service_android.h"
-#if defined(USE_ICU_ALTERNATIVES)
+#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
#include "net/base/net_string_util_icu_alternatives_android.h"
#endif
@@ -32,7 +32,7 @@ static base::android::RegistrationMethod kNetRegisteredMethods[] = {
net::NetworkChangeNotifierAndroid::Register },
{ "ProxyConfigService", net::ProxyConfigServiceAndroid::Register },
{ "X509Util", net::RegisterX509Util },
-#if defined(USE_ICU_ALTERNATIVES)
+#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
{ "NetStringUtils", net::RegisterNetStringUtils }
#endif
};
« no previous file with comments | « components/cronet/android/cronet_jni.cc ('k') | net/base/net_util_icu_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698